Bug 1017636 - Remove all conditional request headers when cache entry's sec-info or input fails to open, r=mcmanus, a=ryanvm on a CLOSED TREE
authorHonza Bambas <honzab.moz@firemni.cz>
Thu, 29 May 2014 19:42:33 +0200
changeset 185643 ea48287c48a70325bab4928e9c38b0fad1e9a0a3
parent 185642 29ca8bc78484630eb38ed9e159552b73e34b9bf5
child 185644 ca1f7ae987ee13a4040d575b8371944872ee86ca
push id44135
push userhonzab.moz@firemni.cz
push dateThu, 29 May 2014 17:43:06 +0000
treeherdermozilla-inbound@ea48287c48a7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus, ryanvm
bugs1017636
milestone32.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 1017636 - Remove all conditional request headers when cache entry's sec-info or input fails to open, r=mcmanus, a=ryanvm on a CLOSED TREE
netwerk/protocol/http/nsHttpChannel.cpp
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3006,16 +3006,17 @@ nsHttpChannel::OnCacheEntryCheck(nsICach
     if (mCachedContentIsValid || mDidReval) {
         rv = OpenCacheInputStream(entry, mCachedContentIsValid);
         if (NS_FAILED(rv)) {
             // If we can't get the entity then we have to act as though we
             // don't have the cache entry.
             if (mDidReval) {
                 // Make the request unconditional again.
                 mRequestHead.ClearHeader(nsHttp::If_Modified_Since);
+                mRequestHead.ClearHeader(nsHttp::If_None_Match);
                 mRequestHead.ClearHeader(nsHttp::ETag);
                 mDidReval = false;
             }
             mCachedContentIsValid = false;
         }
     }
 
     if (mDidReval)