bug 1465258 - remove load group workaround in new OCSP code r=jcj
authorDavid Keeler <dkeeler@mozilla.com>
Tue, 29 May 2018 16:03:37 -0700
changeset 420456 bcdac263d98f058513827f545c90ed63460ba57f
parent 420455 eac86d628a46bcb6a97d9220ac4abc2c9f193947
child 420457 6272dd5e7417adf68255abfb1d691a36e5a2d6e8
push id34072
push useraiakab@mozilla.com
push dateWed, 30 May 2018 22:00:19 +0000
treeherdermozilla-central@6272dd5e7417 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcj
bugs1465258, 1456489, 1456742
milestone62.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 1465258 - remove load group workaround in new OCSP code r=jcj The patch for bug 1456489 included a workaround for the issue that origin attributes weren't honored on channels that didn't have a load group set (bug 1456742). Now that that's fixed, we don't need the workaround. MozReview-Commit-ID: I4ExIqt6dYo
security/manager/ssl/nsNSSCallbacks.cpp
--- a/security/manager/ssl/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/nsNSSCallbacks.cpp
@@ -277,22 +277,16 @@ OCSPRequest::Run()
       return NotifyDone(NS_ERROR_FAILURE, lock);
     }
     rv = loadInfo->SetOriginAttributes(attrs);
     if (NS_FAILED(rv)) {
       return NotifyDone(rv, lock);
     }
   }
 
-  // If we don't set a load group, the above origin attributes won't be honored
-  // by necko. This seems to be a bug or at least an API confusion issue, hence
-  // bug 1456742.
-  nsCOMPtr<nsILoadGroup> lg = do_CreateInstance(NS_LOADGROUP_CONTRACTID);
-  channel->SetLoadGroup(lg);
-
   nsCOMPtr<nsIInputStream> uploadStream;
   rv = NS_NewByteInputStream(getter_AddRefs(uploadStream),
                              reinterpret_cast<const char*>(mPOSTData.begin()),
                              mPOSTData.length());
   if (NS_FAILED(rv)) {
     return NotifyDone(rv, lock);
   }
   nsCOMPtr<nsIUploadChannel> uploadChannel(do_QueryInterface(channel));