Merge change 8008

* changes:
  Allow 205 and 305 to have content.

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;
     }
 
     /**

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));
     }
 
     /**