Merge "Do not send the not-modified response when validating the cache."
diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java
index 7da99ca..4bdab0a 100644
--- a/core/java/android/webkit/LoadListener.java
+++ b/core/java/android/webkit/LoadListener.java
@@ -1014,8 +1014,12 @@
// 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;
}