diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-04 23:39:37 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-04 23:39:37 +0100 |
| commit | 79487a1a05a9e912c63d7a5259db2eccfc59af2b (patch) | |
| tree | d8bbe7ee6c24aba879148a7a08f4adfd40ccaa21 /netwerk/protocol/http/nsHttpChannel.cpp | |
| parent | bb3f5cef325cc1a1e3d0d383bd34e4a35fb25c49 (diff) | |
| download | UXP-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/nsHttpChannel.cpp')
| -rw-r--r-- | netwerk/protocol/http/nsHttpChannel.cpp | 9 |
1 files changed, 2 insertions, 7 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); |