Bug 804657 Remove UI for removed HTTP keep-alive preference r=IanN a=IanN
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Wed, 31 Oct 2012 20:16:48 +0000
changeset 13530 896eaa8b2eac564205f6668b96e5fa55ba1ec476
parent 13529 2ccb24c2d876f08ef45388dde4f656bd9a4f9d1b
child 13531 4666574fa5962aed89e5463f409f64f0d37aa5a4
push idunknown
push userunknown
push dateunknown
reviewersIanN, IanN
bugs804657
Bug 804657 Remove UI for removed HTTP keep-alive preference r=IanN a=IanN
suite/common/pref/pref-http.js
suite/common/pref/pref-http.xul
suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
--- a/suite/common/pref/pref-http.js
+++ b/suite/common/pref/pref-http.js
@@ -7,22 +7,20 @@ function Startup()
 {
   CheckPipelining();
   CheckPipeliningProxy();
 }
  
 function CheckPipelining()
 {
   var prefHTTPVersion = document.getElementById("network.http.version");
-  var prefKeepAlive = document.getElementById("network.http.keep-alive");
 
-  var enabled = (prefHTTPVersion.value == "1.1" && prefKeepAlive.value);
+  var enabled = prefHTTPVersion.value == "1.1";
   EnableElementById("enablePipelining", enabled, false);
 }
 
 function CheckPipeliningProxy()
 {
   var prefHTTPVersion = document.getElementById("network.http.proxy.version");
-  var prefKeepAlive = document.getElementById("network.http.proxy.keep-alive");
 
-  var enabled = (prefHTTPVersion.value == "1.1" && prefKeepAlive.value);
+  var enabled = prefHTTPVersion.value == "1.1";
   EnableElementById("enablePipeliningProxy", enabled, false);
 }
--- a/suite/common/pref/pref-http.xul
+++ b/suite/common/pref/pref-http.xul
@@ -9,31 +9,23 @@
             label="&pref.http.title;"
             script="chrome://communicator/content/pref/pref-http.js">
 
     <preferences>
       <preference id="network.http.version"
                   name="network.http.version"
                   type="string"
                   onchange="CheckPipelining();"/>
-      <preference id="network.http.keep-alive"
-                  name="network.http.keep-alive"
-                  type="bool"
-                  onchange="CheckPipelining();"/>
       <preference id="network.http.pipelining"
                   name="network.http.pipelining"
                   type="bool"/>
       <preference id="network.http.proxy.version"
                   name="network.http.proxy.version"
                   type="string"
                   onchange="CheckPipeliningProxy();"/>
-      <preference id="network.http.proxy.keep-alive"
-                  name="network.http.proxy.keep-alive"
-                  type="bool"
-                  onchange="CheckPipeliningProxy();"/>
       <preference id="network.http.proxy.pipelining"
                   name="network.http.proxy.pipelining"
                   type="bool"/>
       <preference id="general.useragent.compatMode.firefox"
                   name="general.useragent.compatMode.firefox"
                   type="bool"/>
     </preferences>
 
@@ -50,21 +42,16 @@
                    accesskey="&prefEnableHTTP10.accesskey;"/>
             <radio value="1.1"
                    label="&prefEnableHTTP11.label;" 
                    accesskey="&prefEnableHTTP11.accesskey;"/>
           </radiogroup>
 
           <separator class="thin"/>
 
-          <checkbox id="enableKeepAlive"
-                    label="&prefEnableKeepAlive.label;"
-                    accesskey="&prefEnableKeepAlive.accesskey;" 
-                    preference="network.http.keep-alive"/>
-
           <checkbox id="enablePipelining"
                     label="&prefEnablePipelining.label;"
                     accesskey="&prefEnablePipelining.accesskey;"
                     preference="network.http.pipelining"/>
         </vbox>
       </groupbox>
 
       <groupbox flex="1">
@@ -77,21 +64,16 @@
                    accesskey="&prefEnableHTTP10Proxy.accesskey;"/>
             <radio value="1.1"
                    label="&prefEnableHTTP11.label;" 
                    accesskey="&prefEnableHTTP11Proxy.accesskey;"/>
           </radiogroup>
 
           <separator class="thin"/>
 
-          <checkbox id="enableKeepAliveProxy"
-                    label="&prefEnableKeepAlive.label;"
-                    accesskey="&prefEnableKeepAliveProxy.accesskey;" 
-                    preference="network.http.proxy.keep-alive"/>
-
           <checkbox id="enablePipeliningProxy"
                     label="&prefEnablePipelining.label;"
                     accesskey="&prefEnablePipeliningProxy.accesskey;"
                     preference="network.http.proxy.pipelining"/>
         </vbox>
       </groupbox>
     </hbox>
 
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -404,18 +404,16 @@
     <ul>
       <li><strong>Use HTTP 1.0</strong>: Choose this to use the original
         version of HTTP, standardized in 1996.</li>
       <li><strong>Use HTTP 1.1</strong>: Choose this to use the new version of
         HTTP, which offers performance enhancements, including more efficient
         use of HTTP connections, better support for client-side caching,
         multiple HTTP requests (pipelining), and more refined control over
         cache expiration and replacement policies.</li>
-      <li><strong>Enable Keep-Alive</strong>: Select this to keep a connection
-        open to make additional HTTP requests, increasing speed.</li>
       <li><strong>Enable Pipelining</strong>: Select this to
         enable pipelining, which allows for more than one HTTP request to be
         sent to the server at once, reducing delays loading web pages.
 
         <p><strong>Note</strong>: Pipelining is only available with 
           HTTP 1.1.</p></li>
     </ul>
   </li>