Bug 804657 Remove UI for removed HTTP keep-alive preference r=IanN
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sat, 27 Oct 2012 15:10:43 +0100
changeset 11387 1789fa3d0540fd783a1fe3b35e6b81600e67364c
parent 11386 bb9726218797d21a1277e7ae9bfed3226b408a2f
child 11388 0e457d4ab6923ff23910817bae8267577d1dad02
push id8518
push userneil@parkwaycc.co.uk
push dateSat, 27 Oct 2012 14:15:44 +0000
treeherdercomm-central@0e457d4ab692 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs804657
Bug 804657 Remove UI for removed HTTP keep-alive preference r=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
suite/locales/en-US/chrome/common/pref/pref-http.dtd
--- 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>
--- a/suite/locales/en-US/chrome/common/pref/pref-http.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-http.dtd
@@ -8,19 +8,16 @@
 <!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          "E">
 <!ENTITY prefEnableHTTP11Proxy.accesskey     "T">
-<!ENTITY prefEnableKeepAlive.label           "Enable Keep-Alive">
-<!ENTITY prefEnableKeepAlive.accesskey       "K">
-<!ENTITY prefEnableKeepAliveProxy.accesskey  "A">
 <!ENTITY prefEnablePipelining.label          "Enable Pipelining">
 <!ENTITY prefEnablePipelining.accesskey      "P">
 <!ENTITY prefEnablePipeliningProxy.accesskey "N">
 <!ENTITY prefPara                            "HTTP connections may be fine-tuned using these options to enhance either performance or compatibility. Some proxy servers, for example, are known to require HTTP/1.0 (see the release notes for details).">
 <!ENTITY prefPipeWarning                     "WARNING: pipelining is an experimental feature, designed to improve page-load performance, that is unfortunately not well supported by some web servers and proxies.">
 <!ENTITY prefUseragent.label                 "User Agent String">
 <!ENTITY prefFirefoxCompat.label             "Advertise Firefox compatibility">
 <!ENTITY prefFirefoxCompat.accesskey         "F">