bug 1003448 - HTTP/2 Alternate Service and Opportunistic Security [2/…

…2 necko] r=hurley
dothq · Aug 21, 2014 · a7de0b2 · a7de0b2
1 parent 39d073c
commit a7de0b2
Show file tree

Hide file tree

Showing 33 changed files with 1,648 additions and 129 deletions.
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
@@ -1246,6 +1246,16 @@ 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(a9cdd875-2ef8-4d53-95d6-e4e18f65e0db)]
+[builtinclass, uuid(f6a0d1e5-369f-4abc-81ae-d370d36e4006)]
 interface nsISpeculativeConnectionOverrider : nsISupports
 {
     /**
@@ -63,4 +63,9 @@ 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,6 +395,13 @@ Predictor::GetIsFromPredictor(bool *isFromPredictor)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+Predictor::GetAllow1918(bool *allow1918)
+{
+  *allow1918 = false;
+  return NS_OK;
+}
+
 // Predictor::nsIInterfaceRequestor
 
 NS_IMETHODIMP