am e861b8f9: Merge " Fix issue with authentication with flash" into eclair-mr2

Merge commit 'e861b8f95dd52f89b7e7e34ba1bfc5b85c290292' into eclair-mr2-plus-aosp

* commit 'e861b8f95dd52f89b7e7e34ba1bfc5b85c290292':
  Fix issue with authentication with flash

core/java/android/webkit/LoadListener.java

@@ -1021,6 +1021,13 @@ class LoadListener extends Handler implements EventHandler {
             return;
         }
 
+        // If the response is an authentication and we've resent the
+        // request with some credentials then don't commit the headers
+        // of this response; wait for the response to the request with the
+        // credentials.
+        if (mAuthHeader != null)
+            return;
+
         // Commit the headers to WebCore
         int nativeResponse = createNativeResponse();
         // The native code deletes the native response object.