Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

2 files changed, 0 insertions, 56 deletions

diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index d1c67f01b..7c88b9222 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -737,7 +737,6 @@ HttpChannelParent::RecvRedirect2Verify(const nsresult& result,
 {
   LOG(("HttpChannelParent::RecvRedirect2Verify [this=%p result=%x]\n",
        this, result));
-  nsresult rv;
   if (NS_SUCCEEDED(result)) {
     nsCOMPtr<nsIHttpChannel> newHttpChannel =
         do_QueryInterface(mRedirectChannel);
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 7bcec146d..ac855b478 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -24,7 +24,6 @@
 #include "nsICryptoHash.h"
 #include "nsINetworkInterceptController.h"
 #include "nsINSSErrorsService.h"
-#include "nsISecurityReporter.h"
 #include "nsIStringBundle.h"
 #include "nsIStreamListenerTee.h"
 #include "nsISeekableStream.h"
@@ -1733,56 +1732,6 @@ nsHttpChannel::ProcessContentSignatureHeader(nsHttpResponseHead *aResponseHead)
     return NS_OK;
 }
 
-/**
- * Decide whether or not to send a security report and, if so, give the
- * SecurityReporter the information required to send such a report.
- */
-void
-nsHttpChannel::ProcessSecurityReport(nsresult status) {
-    uint32_t errorClass;
-    nsCOMPtr<nsINSSErrorsService> errSvc =
-            do_GetService("@mozilla.org/nss_errors_service;1");
-    // getErrorClass will throw a generic NS_ERROR_FAILURE if the error code is
-    // not in the set of errors covered by the NSS errors service.
-    nsresult rv = errSvc->GetErrorClass(status, &errorClass);
-    if (!NS_SUCCEEDED(rv)) {
-        return;
-    }
-
-    // if the content was not loaded succesfully and we have security info,
-    // send a TLS error report - we must do this early as other parts of
-    // OnStopRequest can return early
-    bool reportingEnabled =
-            Preferences::GetBool("security.ssl.errorReporting.enabled");
-    bool reportingAutomatic =
-            Preferences::GetBool("security.ssl.errorReporting.automatic");
-    if (!mSecurityInfo || !reportingEnabled || !reportingAutomatic) {
-        return;
-    }
-
-    nsCOMPtr<nsITransportSecurityInfo> secInfo =
-            do_QueryInterface(mSecurityInfo);
-    nsCOMPtr<nsISecurityReporter> errorReporter =
-            do_GetService("@mozilla.org/securityreporter;1");
-
-    if (!secInfo || !mURI) {
-        return;
-    }
-
-    nsAutoCString hostStr;
-    int32_t port;
-    rv = mURI->GetHost(hostStr);
-    if (!NS_SUCCEEDED(rv)) {
-        return;
-    }
-
-    rv = mURI->GetPort(&port);
-
-    if (NS_SUCCEEDED(rv)) {
-        errorReporter->ReportTLSError(secInfo, hostStr, port);
-    }
-}
-
 bool
 nsHttpChannel::IsHTTPS()
 {
@@ -6687,10 +6636,6 @@ nsHttpChannel::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult st
     MOZ_ASSERT(NS_IsMainThread(),
                "OnStopRequest should only be called from the main thread");
 
-    if (NS_FAILED(status)) {
-        ProcessSecurityReport(status);
-    }
-
     // If this load failed because of a security error, it may be because we
     // are in a captive portal - trigger an async check to make sure.
     int32_t nsprError = -1 * NS_ERROR_GET_CODE(status);