Title: [125436] trunk/Source/WebCore
- Revision
- 125436
- Author
- [email protected]
- Date
- 2012-08-13 12:30:15 -0700 (Mon, 13 Aug 2012)
Log Message
FrameLoader::receivedMainResourceError doesn't handle GET cancellations well.
https://bugs.webkit.org/show_bug.cgi?id=93850
Patch by Mike West <[email protected]> on 2012-08-13
Reviewed by Adam Barth.
'FrameLoader::cancel' should reset the loader's state, and it mostly
does. In the case of a GET form submission, however, the submitted form
URL that's stored doesn't match the URL that's requested (query string).
This leads to the loader getting a bit confused about what's going on,
and not clearing the stored form submission URL.
This patch moves to storing the form submission's actual request URL
as opposed to the form action URL.
None of the current tests should break, and when issue 93777 lands, it
won't be broken either.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::submitForm):
Switched to using 'FormSubmission::requestURL', as that matches the
URL that's actually requested during a form submission via GET.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125435 => 125436)
--- trunk/Source/WebCore/ChangeLog 2012-08-13 19:25:12 UTC (rev 125435)
+++ trunk/Source/WebCore/ChangeLog 2012-08-13 19:30:15 UTC (rev 125436)
@@ -1,3 +1,27 @@
+2012-08-13 Mike West <[email protected]>
+
+ FrameLoader::receivedMainResourceError doesn't handle GET cancellations well.
+ https://bugs.webkit.org/show_bug.cgi?id=93850
+
+ Reviewed by Adam Barth.
+
+ 'FrameLoader::cancel' should reset the loader's state, and it mostly
+ does. In the case of a GET form submission, however, the submitted form
+ URL that's stored doesn't match the URL that's requested (query string).
+ This leads to the loader getting a bit confused about what's going on,
+ and not clearing the stored form submission URL.
+
+ This patch moves to storing the form submission's actual request URL
+ as opposed to the form action URL.
+
+ None of the current tests should break, and when issue 93777 lands, it
+ won't be broken either.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::submitForm):
+ Switched to using 'FormSubmission::requestURL', as that matches the
+ URL that's actually requested during a form submission via GET.
+
2012-08-13 Antonio Gomes <[email protected]>
[BlackBerry] Hardware accelerated scrolling of <select> content
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (125435 => 125436)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2012-08-13 19:25:12 UTC (rev 125435)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2012-08-13 19:30:15 UTC (rev 125436)
@@ -334,9 +334,9 @@
// needed any more now that we reset m_submittedFormURL on each mouse or key down event.
if (m_frame->tree()->isDescendantOf(targetFrame)) {
- if (m_submittedFormURL == submission->action())
+ if (m_submittedFormURL == submission->requestURL())
return;
- m_submittedFormURL = submission->action();
+ m_submittedFormURL = submission->requestURL();
}
submission->data()->generateFiles(m_frame->document());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
