summaryrefslogtreecommitdiffstats
path: root/netwerk/protocol/http
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-11-04 23:39:37 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-11-04 23:39:37 +0100
commit79487a1a05a9e912c63d7a5259db2eccfc59af2b (patch)
treed8bbe7ee6c24aba879148a7a08f4adfd40ccaa21 /netwerk/protocol/http
parentbb3f5cef325cc1a1e3d0d383bd34e4a35fb25c49 (diff)
downloadUXP-79487a1a05a9e912c63d7a5259db2eccfc59af2b.tar
UXP-79487a1a05a9e912c63d7a5259db2eccfc59af2b.tar.gz
UXP-79487a1a05a9e912c63d7a5259db2eccfc59af2b.tar.lz
UXP-79487a1a05a9e912c63d7a5259db2eccfc59af2b.tar.xz
UXP-79487a1a05a9e912c63d7a5259db2eccfc59af2b.zip
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.
Diffstat (limited to 'netwerk/protocol/http')
-rw-r--r--netwerk/protocol/http/nsHttpChannel.cpp9
-rw-r--r--netwerk/protocol/http/nsHttpChannel.h4
2 files changed, 2 insertions, 11 deletions
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;