Bug 475156 - forgotten nit fixes

This commit is contained in:
Honza Bambas 2009-10-21 19:34:47 +02:00
parent 445b58dc3f
commit d832ddc396
2 changed files with 4 additions and 2 deletions

View File

@ -1491,8 +1491,10 @@ nsHttpChannel::ProcessNotModified()
LOG(("nsHttpChannel::ProcessNotModified [this=%x]\n", this));
if (mCustomConditionalRequest)
if (mCustomConditionalRequest) {
LOG(("Bypassing ProcessNotModified due to custom conditional headers"));
return NS_ERROR_FAILURE;
}
NS_ENSURE_TRUE(mCachedResponseHead, NS_ERROR_NOT_INITIALIZED);
NS_ENSURE_TRUE(mCacheEntry, NS_ERROR_NOT_INITIALIZED);

View File

@ -385,7 +385,7 @@ private:
PRUint32 mLoadedFromApplicationCache : 1;
PRUint32 mTracingEnabled : 1;
PRUint32 mForceAllowThirdPartyCookie : 1;
// True if consumer added it's own If-None-Match or If-Modified-Since
// True if consumer added its own If-None-Match or If-Modified-Since
// headers. In such a case we must not override them in the cache code
// and also we want to pass possible 304 code response through.
PRUint32 mCustomConditionalRequest : 1;