Backed out 2 changesets (bug 1003448) since their dependency was back…

…ed out CLOSED TREE Backed out changeset 61f98b1d29f9 (bug 1003448) Backed out changeset 8e947d1636f1 (bug 1003448)
dothq · Oct 5, 2014 · 145d867 · 145d867
1 parent 3a2e260
commit 145d867
Show file tree

Hide file tree

Showing 37 changed files with 148 additions and 1,779 deletions.
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
@@ -1247,16 +1247,6 @@ pref("network.http.spdy.send-buffer-size", 131072);
 pref("network.http.spdy.allow-push", true);
 pref("network.http.spdy.push-allowance", 131072);
 
-// alt-svc allows separation of transport routing from
-// the origin host without using a proxy.
-#ifdef RELEASE_BUILD
-pref("network.http.altsvc.enabled", false);
-pref("network.http.altsvc.oe", false);
-#else
-pref("network.http.altsvc.enabled", true);
-pref("network.http.altsvc.oe", true);
-#endif
-
 pref("network.http.diagnostics", false);
 
 pref("network.http.pacing.requests.enabled", true);

diff --git a/netwerk/base/public/nsISpeculativeConnect.idl b/netwerk/base/public/nsISpeculativeConnect.idl
@@ -35,7 +35,7 @@ interface nsISpeculativeConnect : nsISupports
  * inline) to determine whether or not to actually make a speculative
  * connection.
  */
-[builtinclass, uuid(f6a0d1e5-369f-4abc-81ae-d370d36e4006)]
+[builtinclass, uuid(a9cdd875-2ef8-4d53-95d6-e4e18f65e0db)]
 interface nsISpeculativeConnectionOverrider : nsISupports
 {
     /**
@@ -63,9 +63,4 @@ interface nsISpeculativeConnectionOverrider : nsISupports
      * usage.
      */
     [infallible] readonly attribute boolean isFromPredictor;
-
-    /**
-     * by default speculative connections are not made to RFC 1918 addresses
-     */
-    [infallible] readonly attribute boolean allow1918;
 };
diff --git a/netwerk/base/src/Predictor.cpp b/netwerk/base/src/Predictor.cpp
@@ -395,13 +395,6 @@ Predictor::GetIsFromPredictor(bool *isFromPredictor)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-Predictor::GetAllow1918(bool *allow1918)
-{
-  *allow1918 = false;
-  return NS_OK;
-}
-
 // Predictor::nsIInterfaceRequestor
 
 NS_IMETHODIMP