Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2423935 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 8008 

* changes:
  Allow 205 and 305 to have content.
parents 4b5a8f84 c319c69b

core/java/android/net/http/Request.java

+1 −2
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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));

    }



    /**