Bug 1017636 - Remove all conditional request headers when cache entry's sec-info or input fails to open. r=mcmanus
authorHonza Bambas <honzab.moz@firemni.cz>
Thu, 29 May 2014 19:42:33 +0200
changeset 204825 b85b57f05fdae10e36ab79a92eab1c5cea1fe41c
parent 204824 518117e8fc9a048423a10f6d183cbc739f5d6e2d
child 204872 60ae4e4e59fee8e5c1a933b1b9df2fdf1cb2a72f
child 204920 2032e9aee88e80519b93f0af307ee0f0ff08704d
child 204942 20987367996183a3d13c835fb6935defe376cb35
child 208452 8ce423bdfca34e4b949574c61ba83067d17812f2
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus
bugs1017636
milestone32.0a1
first release with
nightly linux32
b85b57f05fda / 32.0a1 / 20140529113510 / files
nightly linux64
b85b57f05fda / 32.0a1 / 20140529113510 / files
nightly mac
b85b57f05fda / 32.0a1 / 20140529113510 / files
nightly win32
b85b57f05fda / 32.0a1 / 20140529113510 / files
nightly win64
b85b57f05fda / 32.0a1 / 20140529113510 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
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
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)