diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 10:17:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 10:17:27 -0700 |
| commit | f24239355f4f50e1385ff46e598466757a3f02ec (patch) | |
| tree | d38c0c69ec30484009e729c5b319200ad7c61540 /core/java/android | |
| parent | 4b5a8f84b107a34a8030be2d3f3a5793d8e0ccce (diff) | |
| parent | c319c69b1228f5eee2f9d71a71ad021f3d8ba82b (diff) | |
Merge change 8008
* changes:
Allow 205 and 305 to have content.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/http/Request.java | 3 | ||||
| -rw-r--r-- | core/java/android/webkit/LoadListener.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/net/http/Request.java b/core/java/android/net/http/Request.java index e160ab686d06..1b6568e7f118 100644 --- a/core/java/android/net/http/Request.java +++ b/core/java/android/net/http/Request.java @@ -417,8 +417,7 @@ class Request { } return status >= HttpStatus.SC_OK && status != HttpStatus.SC_NO_CONTENT - && status != HttpStatus.SC_NOT_MODIFIED - && status != HttpStatus.SC_RESET_CONTENT; + && status != HttpStatus.SC_NOT_MODIFIED; } /** diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java index c0b6dab54c29..4fe4036d3b87 100644 --- a/core/java/android/webkit/LoadListener.java +++ b/core/java/android/webkit/LoadListener.java @@ -1370,7 +1370,8 @@ class LoadListener extends Handler implements EventHandler { */ private boolean ignoreCallbacks() { return (mCancelled || mAuthHeader != null || - (mStatusCode > 300 && mStatusCode < 400)); + // Allow 305 (Use Proxy) to call through. + (mStatusCode > 300 && mStatusCode < 400 && mStatusCode != 305)); } /** |