Bug 1059474 - update certificate exception handling in lightning to deal with bug 940506 r=philipp a=philipp
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Thu, 09 Oct 2014 12:34:11 +0200
changeset 25440 77eb6f57422bb59f1767c0f0f12385937f5007e7
parent 25439 efc10d42fadfadea94fb8acf619c7744d356b143
child 25441 c17de9d89bcf380e6d232303c26b5135861fa266
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp, philipp
bugs1059474, 940506
Bug 1059474 - update certificate exception handling in lightning to deal with bug 940506 r=philipp a=philipp
calendar/base/modules/calProviderUtils.jsm
--- a/calendar/base/modules/calProviderUtils.jsm
+++ b/calendar/base/modules/calProviderUtils.jsm
@@ -143,32 +143,31 @@ cal.InterfaceRequestor_getInterface = fu
  */
 cal.BadCertHandler = function calBadCertHandler(thisProvider) {
     this.thisProvider = thisProvider;
 };
 cal.BadCertHandler.prototype = {
     QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIBadCertListener2]),
 
     notifyCertProblem: function cBCL_notifyCertProblem(socketInfo, status, targetSite) {
-        if (!status) {
-            return true;
-        }
-
         // Unfortunately we can't pass js objects using the window watcher, so
         // we'll just take the first available calendar window. We also need to
         // do this on a timer so that the modal window doesn't block the
         // network request.
         let calWindow = cal.getCalendarWindow();
 
         let timerCallback = {
             thisProvider: this.thisProvider,
             notify: function(timer) {
-                let params = { exceptionAdded: false,
-                               prefetchCert: true,
-                               location: targetSite };
+                let params = {
+                  exceptionAdded: false,
+                  sslStatus : status,
+                  prefetchCert: true,
+                  location: targetSite
+                };
                 calWindow.openDialog("chrome://pippki/content/exceptionDialog.xul",
                                      "",
                                      "chrome,centerscreen,modal",
                                      params);
                 if (this.thisProvider.canRefresh &&
                     params.exceptionAdded) {
                     // Refresh the provider if the
                     // exception certificate was added