Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not send the not-modified response when validating the cache."

Browse Source
This commit is contained in:
Patrick Scott
2010-03-11 11:47:22 -08:00
committed by Android (Google) Code Review
parent 5acac5f216 5ac85ccabb
commit 08e1f21dd4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/webkit/LoadListener.java
View File

@@ -1014,8 +1014,12 @@ class LoadListener extends Handler implements EventHandler {
// do not call webcore if it is redirect. According to the code in
// InspectorController::willSendRequest(), the response is only updated
// when it is not redirect.
if ((mStatusCode >= 301 && mStatusCode <= 303) || mStatusCode == 307) {
// when it is not redirect. If we received a not-modified response from
// the server and mCacheLoader is not null, do not send the response to
// webkit. This is just a validation response for loading from the
// cache.
if ((mStatusCode >= 301 && mStatusCode <= 303) || mStatusCode == 307 ||
(mStatusCode == 304 && mCacheLoader != null)) {
return;
}