diff options
author | Andrei Popescu <andreip@google.com> | 2010-04-12 12:03:32 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-12 12:03:32 -0700 |
commit | 30f1407065eeef96453ba46aa338ee7ff6dd2165 (patch) | |
tree | ed056002081ed27e37db85db0e8a9d462e6b9a54 /WebCore | |
parent | 61c1b0ac380b1947aae2bd2394cc255e0c35ebf9 (diff) | |
parent | 7e4f318aefb7e4932b10e646dffd138e923e315d (diff) | |
download | external_webkit-30f1407065eeef96453ba46aa338ee7ff6dd2165.zip external_webkit-30f1407065eeef96453ba46aa338ee7ff6dd2165.tar.gz external_webkit-30f1407065eeef96453ba46aa338ee7ff6dd2165.tar.bz2 |
Merge "Cherry-pick http://codereview.chromium.org/1594015" into froyo
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/loader/DocumentThreadableLoader.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/loader/DocumentThreadableLoader.cpp b/WebCore/loader/DocumentThreadableLoader.cpp index de0a0b0..d0f6c04 100644 --- a/WebCore/loader/DocumentThreadableLoader.cpp +++ b/WebCore/loader/DocumentThreadableLoader.cpp @@ -287,6 +287,7 @@ void DocumentThreadableLoader::preflightSuccess() void DocumentThreadableLoader::preflightFailure() { + m_actualRequest = 0; // Prevent didFinishLoading() from bypassing access check. m_client->didFail(ResourceError()); } |