fixes bug 136956 "HTTP preferences panel needs to control proxy settings

as well" r=brade sr=alecf

suite/common/pref/pref-http.js

@@ -40,16 +40,28 @@
 function checkPipelining()
 {
   try {
-    var browserEnableHTTP11 = document.getElementById("httpVersion11");
-    var browserEnableKeepAlive = document.getElementById("browserEnableKeepAlive");
-    var browserEnablePipelining = document.getElementById("browserEnablePipelining");
+    var enableHTTP11 = document.getElementById("httpVersion11");
+    var enableKeepAlive = document.getElementById("enableKeepAlive");
+    var enablePipelining = document.getElementById("enablePipelining");
 
-    if (browserEnableHTTP11.selected && browserEnableKeepAlive.checked) {
-      browserEnablePipelining.removeAttribute("disabled");
-    } else {
-      browserEnablePipelining.setAttribute("disabled", "true");
-      browserEnablePipelining.setAttribute("checked", "false");
-    }
+    var doDisable = !(enableHTTP11.selected && enableKeepAlive.checked);
+    enablePipelining.disabled = doDisable;
+    if (doDisable)
+      enablePipelining.checked = false;
+  } catch(e) {}
+}
+
+function checkPipeliningProxy()
+{
+  try {
+    var enableHTTP11 = document.getElementById("httpVersion11Proxy");
+    var enableKeepAlive = document.getElementById("enableKeepAliveProxy");
+    var enablePipelining = document.getElementById("enablePipeliningProxy");
+
+    var doDisable = !(enableHTTP11.selected && enableKeepAlive.checked);
+    enablePipelining.disabled = doDisable;
+    if (doDisable)
+      enablePipelining.checked = false;
   } catch(e) {}
 }
 

suite/common/pref/pref-http.xul

@@ -41,7 +41,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-http.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-http.xul');checkPipelining();"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-http.xul');checkPipelining();checkPipeliningProxy();"
       headertitle="&lHeader;">
 
   <script type="application/x-javascript" 
@@ -49,13 +49,16 @@
           
   <script type="application/x-javascript">
   <![CDATA[
-    var _elementIDs = ["browserEnableKeepAlive", "browserEnablePipelining",
-                       "acceptEncodingString", "httpVersion"];
+    var _elementIDs = ["httpVersion", "enableKeepAlive", "enablePipelining",
+                       "httpVersionProxy",
+                       "enableKeepAliveProxy", "enablePipeliningProxy",
+                       "acceptEncodingString"];
   ]]>
   </script>
 
-  <groupbox>
-    <caption label="&prefNetworking.label;"/>
+  <hbox align="start">
+  <groupbox flex="1">
+    <caption label="&prefDirect.label;"/>
     <vbox class="box-padded" align="start">
       <radiogroup id="httpVersion" 
                   preftype="string" prefstring="network.http.version"
@@ -68,17 +71,41 @@
 
       <separator/>
 
-      <checkbox id="browserEnableKeepAlive" label="&prefEnableKeepAlive.label;"
+      <checkbox id="enableKeepAlive" label="&prefEnableKeepAlive.label;"
                 accesskey="&prefEnableKeepAlive.accesskey;" 
                 prefstring="network.http.keep-alive" oncommand="checkPipelining();"/>
 
-      <checkbox id="browserEnablePipelining" label="&prefEnablePipelining.label;"
+      <checkbox id="enablePipelining" label="&prefEnablePipelining.label;"
                 accesskey="prefEnablePipelining.accesskey;"
                 prefstring="network.http.pipelining"/>
     </vbox>
-
   </groupbox>
 
+  <groupbox flex="1">
+    <caption label="&prefProxy.label;"/>
+    <vbox class="box-padded" align="start">
+      <radiogroup id="httpVersionProxy" 
+                  preftype="string" prefstring="network.http.proxy.version"
+                  oncommand="checkPipeliningProxy();">
+        <radio value="1.0" label="&prefEnableHTTP10.label;"
+               accesskey="&prefEnableHTTP10Proxy.accesskey;"/>
+        <radio value="1.1" label="&prefEnableHTTP11.label;" 
+               accesskey="&prefEnableHTTP11Proxy.accesskey;" id="httpVersion11Proxy"/>
+      </radiogroup>
+
+      <separator/>
+
+      <checkbox id="enableKeepAliveProxy" label="&prefEnableKeepAlive.label;"
+                accesskey="&prefEnableKeepAliveProxy.accesskey;" 
+                prefstring="network.http.proxy.keep-alive" oncommand="checkPipeliningProxy();"/>
+
+      <checkbox id="enablePipeliningProxy" label="&prefEnablePipelining.label;"
+                accesskey="&prefEnablePipeliningProxy.accesskey;"
+                prefstring="network.http.proxy.pipelining"/>
+    </vbox>
+  </groupbox>
+  </hbox>
+
   <groupbox>
     <caption label="&acceptEncoding.label;"/>
     <vbox class="box-padded">

suite/locales/en-US/chrome/common/pref/pref-http.dtd

@@ -2,16 +2,21 @@
 <!ENTITY rHeader "HTTP Network Preferences">
 
 <!-- Network-->
-<!ENTITY prefNetworking.label            "HTTP Networking Options">
-<!ENTITY prefEnableHTTP10.label          "Use HTTP 1.0">
-<!ENTITY prefEnableHTTP10.accesskey      "U">
-<!ENTITY prefEnableHTTP11.label          "Use HTTP 1.1">
-<!ENTITY prefEnableHTTP11.accesskey      "H">
-<!ENTITY prefEnableKeepAlive.label       "Enable Persistent Connections">
-<!ENTITY prefEnableKeepAlive.accesskey   "C">
-<!ENTITY prefEnablePipelining.label      "Enable Pipelining">
-<!ENTITY prefEnablePipelining.accesskey  "P">
-<!ENTITY acceptEncoding.label            "Accept-Encoding:">
-<!ENTITY acceptEncoding.accesskey        "A">
-<!ENTITY resetButton.label               "Restore Default">
-<!ENTITY resetButton.accesskey           "R">
+<!ENTITY prefDirect.label                    "Direct Connection Options">
+<!ENTITY prefProxy.label                     "Proxy Connection Options">
+<!ENTITY prefEnableHTTP10.label              "Use HTTP 1.0">
+<!ENTITY prefEnableHTTP10.accesskey          "U">
+<!ENTITY prefEnableHTTP10Proxy.accesskey     "S">
+<!ENTITY prefEnableHTTP11.label              "Use HTTP 1.1">
+<!ENTITY prefEnableHTTP11.accesskey          "H">
+<!ENTITY prefEnableHTTP11Proxy.accesskey     "T">
+<!ENTITY prefEnableKeepAlive.label           "Enable Keep-Alive">
+<!ENTITY prefEnableKeepAlive.accesskey       "K">
+<!ENTITY prefEnableKeepAliveProxy.accesskey  "L">
+<!ENTITY prefEnablePipelining.label          "Enable Pipelining">
+<!ENTITY prefEnablePipelining.accesskey      "P">
+<!ENTITY prefEnablePipeliningProxy.accesskey "I">
+<!ENTITY acceptEncoding.label                "Accept-Encoding:">
+<!ENTITY acceptEncoding.accesskey            "A">
+<!ENTITY resetButton.label                   "Restore Default">
+<!ENTITY resetButton.accesskey               "R">