Bug 591537 - Freeze UA build id for Firefox branded builds. r=dao/khuey, sr=jst, a=beta5+

config/autoconf.mk.in

@@ -53,6 +53,7 @@ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
 MOZ_APP_UA_NAME = @MOZ_APP_UA_NAME@
 MOZ_APP_VERSION = @MOZ_APP_VERSION@
 MOZ_UA_FIREFOX_VERSION = @FIREFOX_VERSION@
+MOZ_UA_BUILDID = @MOZ_UA_BUILDID@
 
 MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
 

configure.in

@@ -8774,6 +8774,8 @@ AC_SUBST(MOZ_APP_VERSION)
 AC_DEFINE_UNQUOTED(MOZ_UA_FIREFOX_VERSION, "$FIREFOX_VERSION")
 AC_SUBST(MOZ_UA_FIREFOX_VERSION)
 AC_SUBST(FIREFOX_VERSION)
+AC_DEFINE_UNQUOTED(MOZ_UA_BUILDID, "$MOZ_UA_BUILDID")
+AC_SUBST(MOZ_UA_BUILDID)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 

netwerk/protocol/http/nsHttpHandler.cpp

@@ -189,9 +189,9 @@ nsHttpHandler::nsHttpHandler()
     , mPipeliningOverSSL(PR_FALSE)
     , mLastUniqueID(NowInSeconds())
     , mSessionStartTime(0)
-    , mProduct("Gecko")
     , mLegacyAppName("Mozilla")
     , mLegacyAppVersion("5.0")
+    , mProduct("Gecko")
     , mUserAgentIsDirty(PR_TRUE)
     , mUseCache(PR_TRUE)
     , mPromptTempRedirect(PR_TRUE)
@@ -313,7 +313,8 @@ nsHttpHandler::Init()
     rv = InitConnectionMgr();
     if (NS_FAILED(rv)) return rv;
 
-    if (appInfo)
+    mProductSub.AssignLiteral(MOZ_UA_BUILDID);
+    if (mProductSub.IsEmpty() && appInfo)
         appInfo->GetPlatformBuildID(mProductSub);
     if (mProductSub.Length() > 8)
         mProductSub.SetLength(8);
@@ -808,12 +809,6 @@ nsHttpHandler::InitUserAgentComponents()
     mUserAgentIsDirty = PR_TRUE;
 }
 
-static int StringCompare(const void* s1, const void* s2, void*)
-{
-    return nsCRT::strcmp(*static_cast<const char *const *>(s1),
-                         *static_cast<const char *const *>(s2));
-}
-
 void
 nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
 {

other-licenses/branding/firefox/configure.sh

@@ -1 +1,2 @@
 MOZ_APP_DISPLAYNAME=Firefox
+MOZ_UA_BUILDID=20100101