Bug 572668. Don't send the useless crypto token in the UA string. r=bzbarsky

netwerk/base/public/security-prefs.js

@@ -1,5 +1,3 @@
-pref("general.useragent.security",       "U");
-
 pref("security.enable_ssl2",             false);
 pref("security.enable_ssl3",             true);
 pref("security.enable_tls",		 true);

netwerk/protocol/http/nsHttpHandler.cpp

@@ -120,7 +120,6 @@ static NS_DEFINE_CID(kSocketProviderServiceCID, NS_SOCKETPROVIDERSERVICE_CID);
 #define UA_PREF_PREFIX          "general.useragent."
 #define UA_APPNAME              "Mozilla"
 #define UA_APPVERSION           "5.0"
-#define UA_APPSECURITY_FALLBACK "N"
 
 #define HTTP_PREF_PREFIX        "network.http."
 #define INTL_ACCEPT_LANGUAGES   "intl.accept_languages"
@@ -272,7 +271,6 @@ nsHttpHandler::Init()
     LOG(("> platform = %s\n", mPlatform.get()));
     LOG(("> oscpu = %s\n", mOscpu.get()));
     LOG(("> device = %s\n", mDeviceType.get()));
-    LOG(("> security = %s\n", mSecurity.get()));
     LOG(("> language = %s\n", mLanguage.get()));
     LOG(("> misc = %s\n", mMisc.get()));
     LOG(("> vendor = %s\n", mVendor.get()));
@@ -605,7 +603,6 @@ nsHttpHandler::BuildUserAgent()
     NS_ASSERTION(!mAppName.IsEmpty() &&
                  !mAppVersion.IsEmpty() &&
                  !mPlatform.IsEmpty() &&
-                 !mSecurity.IsEmpty() &&
                  !mOscpu.IsEmpty(),
                  "HTTP cannot send practical requests without this much");
 
@@ -614,7 +611,6 @@ nsHttpHandler::BuildUserAgent()
     mUserAgent.SetCapacity(mAppName.Length() + 
                            mAppVersion.Length() + 
                            mPlatform.Length() + 
-                           mSecurity.Length() +
                            mOscpu.Length() +
                            mDeviceType.Length() +
                            mLanguage.Length() +
@@ -638,8 +634,6 @@ nsHttpHandler::BuildUserAgent()
     mUserAgent += '(';
     mUserAgent += mPlatform;
     mUserAgent.AppendLiteral("; ");
-    mUserAgent += mSecurity;
-    mUserAgent.AppendLiteral("; ");
     mUserAgent += mOscpu;
     if (!mLanguage.IsEmpty()) {
         mUserAgent.AppendLiteral("; ");
@@ -909,14 +903,6 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         mUserAgentIsDirty = PR_TRUE;
     }
 
-    // Get Security level supported
-    if (PREF_CHANGED(UA_PREF("security"))) {
-        prefs->GetCharPref(UA_PREF("security"), getter_Copies(mSecurity));
-        if (!mSecurity)
-            mSecurity.AssignLiteral(UA_APPSECURITY_FALLBACK);
-        mUserAgentIsDirty = PR_TRUE;
-    }
-
     // Gather locale.
     if (PREF_CHANGED(UA_PREF("locale"))) {
         nsCOMPtr<nsIPrefLocalizedString> pls;

netwerk/protocol/http/nsHttpHandler.h

@@ -297,7 +297,6 @@ private:
     nsCString      mPlatform;
     nsCString      mOscpu;
     nsCString      mDeviceType;
-    nsXPIDLCString mSecurity;
     nsCString      mLanguage;
     nsCString      mMisc;
     nsXPIDLCString mVendor;