From 79487a1a05a9e912c63d7a5259db2eccfc59af2b Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 4 Nov 2018 23:39:37 +0100
Subject: Backout opportunistic encryption changes.

Apparently there is some functional and naming confusion here.
Backing out to re-land after evaluation and possible changes.
Tag #863.
---
 netwerk/protocol/http/nsHttpChannel.cpp | 9 ++-------
 netwerk/protocol/http/nsHttpChannel.h   | 4 ----
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'netwerk/protocol/http')

diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index cfc2ee261..bb0b3ca77 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -313,15 +313,11 @@ nsHttpChannel::nsHttpChannel()
     , mPushedStream(nullptr)
     , mLocalBlocklist(false)
     , mWarningReporter(nullptr)
-    , mSendUpgradeRequest(false)
     , mDidReval(false)
 {
     LOG(("Creating nsHttpChannel [this=%p]\n", this));
     mChannelCreationTime = PR_Now();
     mChannelCreationTimestamp = TimeStamp::Now();
-    
-    mSendUpgradeRequest = 
-      Preferences::GetBool("network.http.opportunistic-encryption", false);
 }
 
 nsHttpChannel::~nsHttpChannel()
@@ -381,9 +377,8 @@ nsHttpChannel::Connect()
                                mLoadInfo->GetExternalContentPolicyType() :
                                nsIContentPolicy::TYPE_OTHER;
 
-    if (mSendUpgradeRequest &&
-        (type == nsIContentPolicy::TYPE_DOCUMENT ||
-         type == nsIContentPolicy::TYPE_SUBDOCUMENT)) {
+    if (type == nsIContentPolicy::TYPE_DOCUMENT ||
+        type == nsIContentPolicy::TYPE_SUBDOCUMENT) {
         rv = SetRequestHeader(NS_LITERAL_CSTRING("Upgrade-Insecure-Requests"),
                               NS_LITERAL_CSTRING("1"), false);
         NS_ENSURE_SUCCESS(rv, rv);
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 152cf1503..2e24d6e81 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -597,10 +597,6 @@ private:
     HttpChannelSecurityWarningReporter* mWarningReporter;
 
     RefPtr<ADivertableParentChannel> mParentChannel;
-    
-    // Whether we send opportunistic encryption requests.
-    bool mSendUpgradeRequest;
-
 protected:
     virtual void DoNotifyListenerCleanup() override;
 
-- 
cgit v1.2.3