922659 - HTTP cache v2: exception from onCacheEntryCheck should cause NOT_FOUND

Status: RESOLVED FIXED

(Core :: Networking: Cache, defect)

Description

[Honza Bambas (:mayhemer)]

Regression from https://hg.mozilla.org/projects/gum/diff/712fb1b90d6b/netwerk/cache2/CacheEntry.cpp

    1.64 -          nsresult rv = aCallback->OnCacheEntryCheck(this, nullptr, &validityState);
    1.65 -          LOG(("  OnCacheEntryCheck result: rv=0x%08x, validity=%d", rv, validityState));
    1.66 +          nsresult rv = aCallback->OnCacheEntryCheck(this, nullptr, &checkResult);
    1.67 +          LOG(("  OnCacheEntryCheck: rv=0x%08x, result=%d", rv, checkResult));
    1.68  
    1.69            if (NS_FAILED(rv))
    1.70 -            validityState = ENTRY_NOT_VALID;
    1.71 +            checkResult = ENTRY_WANTED;
    1.72          }


When the onCacheEntryCheck callback throws (what in this case happens since the range request cannot be established) the entry is still passed to onCacheEntryAvailable.  Originally, before the change I refer above, the entry was thrown away.  So, we need to change ENTRY_WANTED to ENTRY_NOT_WANTED on onCacheEntryCheck failure.

This is not critical since the entry won't be used base on !mCacheContentIsValid.

Comment 1

[Honza Bambas (:mayhemer)]

Attachment: v1

This needs just a formal review since it's disabled by default.

Comment 2

[Honza Bambas (:mayhemer)]

Attachment: v1 [merged]

- remerged

Comment 3

[Honza Bambas (:mayhemer)]

Comment on attachment 827980 [details] [diff] [review]
v1 [merged]

https://hg.mozilla.org/integration/mozilla-inbound/rev/59edeb46f2d6
https://tbpl.mozilla.org/?tree=Try&rev=69d73cf7f79a

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/59edeb46f2d6