Bug 1113780 - Use SSL_ERROR_UNSUPPORTED_VERSION for SSLv3 error page. r=gijs
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Fri, 09 Jan 2015 06:23:00 +0000
changeset 248793 d5977152c82a2beecf3da54d84bc9d8b81d7827e
parent 248792 e6756043d930ee61206b6927a63642b31df6e8ca
child 248794 19867b642ec1a96d1d376e47d325bbe4865438b8
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgijs
bugs1113780
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1113780 - Use SSL_ERROR_UNSUPPORTED_VERSION for SSLv3 error page. r=gijs
browser/base/content/aboutNetError.xhtml
--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -152,33 +152,33 @@
         if (ld)
         {
           ld.parentNode.replaceChild(errDesc, ld);
           // change id to the replaced child's id so styling works
           errDesc.id = "errorLongDesc";
         }
 
         if (err == "nssFailure2" &&
-            sd.textContent.contains("ssl_error_no_cypher_overlap")) {
+            sd.textContent.contains("ssl_error_unsupported_version")) {
           var ssl3ErrorTitle = document.getElementById("et_ssl3");
           var ssl3ErrorDesc = document.getElementById("ed_ssl3");
           var ssl3ShortDesc = document.getElementById("esd_ssl3");
           var learnMoreText = document.getElementById("learn_more_ssl3");
 
           errTitle.parentNode.replaceChild(ssl3ErrorTitle, errTitle);
           ssl3ErrorTitle.id = "errorTitleText";
           ssl3ErrorTitle.setAttribute("sslv3", "true");
           errTitle = ssl3ErrorTitle;
 
           sd.innerHTML = ssl3ShortDesc.innerHTML;
           sd.querySelector('span').textContent = location.hostname;
 
           errDesc.parentNode.replaceChild(ssl3ErrorDesc, errDesc);
           ssl3ErrorDesc.id = "errorLongDesc";
-          ssl3ErrorDesc.querySelector('span').textContent = "ssl_error_no_cypher_overlap";
+          ssl3ErrorDesc.querySelector('span').textContent = "ssl_error_unsupported_version";
 
           var retryBtn = document.getElementById("errorTryAgain");
           retryBtn.textContent = learnMoreText.textContent;
           retryBtn.setAttribute("onclick", "learnMoreSSLV3()");
         }
 
         // remove undisplayed errors to avoid bug 39098
         var errContainer = document.getElementById("errorContainer");