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

Merge commit 'ba74d7ccadc34d09d57886120e9d412d9edbc4d7'

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

core/java/android/webkit/LoadListener.java

@@ -1030,6 +1030,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.