[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
xan at webkit.org
xan at webkit.org
Thu Oct 29 20:38:46 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 517488080387df3f6850763a608d8f7d85120cbf
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Oct 4 18:14:08 2009 +0000
Revert previous patch, as the newly added test breaks other tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49076 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6049eea..05b42a8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
2009-10-04 Xan Lopez <xlopez at igalia.com>
+ Revert previous patch, as the newly added test breaks other tests.
+
+ * http/tests/navigation/postredirect-reload-expected.txt: Removed.
+ * http/tests/navigation/postredirect-reload.html: Removed.
+ * http/tests/navigation/resources/postresult.pl:
+ * http/tests/navigation/resources/reloadresult.pl: Removed.
+ * http/tests/navigation/resources/success200.html:
+ * http/tests/navigation/resources/testcode.js:
+ (runLoadSameTest):
+
+2009-10-04 Xan Lopez <xlopez at igalia.com>
+
Reviewed by Gustavo Noronha.
[GTK] performs a POST when refreshing a view that was obtained with a GET
diff --git a/LayoutTests/http/tests/navigation/postredirect-reload-expected.txt b/LayoutTests/http/tests/navigation/postredirect-reload-expected.txt
deleted file mode 100644
index 5f14196..0000000
--- a/LayoutTests/http/tests/navigation/postredirect-reload-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-PASS
-
-============== Back Forward List ==============
- http://127.0.0.1:8000/navigation/postredirect-reload.html **nav target**
- http://127.0.0.1:8000/navigation/resources/success200.html **nav target**
-curr-> http://127.0.0.1:8000/navigation/resources/reloadresult.pl **nav target**
-===============================================
diff --git a/LayoutTests/http/tests/navigation/postredirect-reload.html b/LayoutTests/http/tests/navigation/postredirect-reload.html
deleted file mode 100644
index 1875836..0000000
--- a/LayoutTests/http/tests/navigation/postredirect-reload.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<script type="text/javascript" src="resources/testcode.js"></script>
-<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
- runRedirectReloadTest("resources/success200.html");
-</script>
-This page just kicks off a test, and should not appear in the expected test output.
-The files in the resources dir have comments about the tests.
diff --git a/LayoutTests/http/tests/navigation/resources/postresult.pl b/LayoutTests/http/tests/navigation/resources/postresult.pl
index a56d673..3aa3479 100755
--- a/LayoutTests/http/tests/navigation/resources/postresult.pl
+++ b/LayoutTests/http/tests/navigation/resources/postresult.pl
@@ -11,7 +11,6 @@ use CGI;
$query = new CGI;
$submitWithPost = $query->param('submitwithpost');
$submitWithPostRedirect = $query->param('submitwithpostredirect');
-$submitWithPostRedirectReload = $query->param('submitwithpostredirectreload');
$redirectHappened = $query->param('redirectHappened');
$method = $query->request_method();
@@ -40,21 +39,6 @@ if (($submitWithPost && $method eq "POST") || ($redirectHappened && $method eq "
</html>
HERE_DOC_END
-} elsif ($submitWithPostRedirectReload && $method eq "POST") {
-
- print "Status: 303 See Other\r\n";
- print "Location: reloadresult.pl\r\n";
- print "Content-type: text/html\r\n";
- print "\r\n";
-
- print <<HERE_DOC_END
- <html>
- <body style="font-size: 32">
- This page should not be seen - it is a 303 redirect to another page.
- </body>
- </html>
-HERE_DOC_END
-
} elsif ($submitWithPostRedirect && $method eq "POST") {
$urlQuery = $query->query_string;
diff --git a/LayoutTests/http/tests/navigation/resources/reloadresult.pl b/LayoutTests/http/tests/navigation/resources/reloadresult.pl
deleted file mode 100755
index 400c0c5..0000000
--- a/LayoutTests/http/tests/navigation/resources/reloadresult.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/perl
-# Simple script to generate a POST result.
-#
-# Depending on which button was pushed in the form, we either generate a direct
-# result page, or we use the pattern where the post returns a 303 redirect,
-# and then the resulting GET yields the true POST result. Sites do this trick
-# to avoid having POSTS in the b/f list, so you don't run into POSTs getting
-# resubmitted by accident.
-
-use CGI;
-$query = new CGI;
-$method = $query->request_method();
-
-if ($method eq "POST") {
-
- print "Content-type: text/html\r\n";
- print "\r\n";
-
- print <<HERE_DOC_END
- <html>
- Test failure: reloadresult.pl was called with an unexpected method ($method).
- </body>
- </html>
-HERE_DOC_END
-
-} elsif ($method eq "GET") {
-
- print "Content-type: text/html\r\n";
- print "\r\n";
-
- print <<HERE_DOC_END
- <html>
- <body>
- PASS
- </body>
- </html>
-HERE_DOC_END
-
-}
diff --git a/LayoutTests/http/tests/navigation/resources/success200.html b/LayoutTests/http/tests/navigation/resources/success200.html
index d9aa060..6ee811a 100644
--- a/LayoutTests/http/tests/navigation/resources/success200.html
+++ b/LayoutTests/http/tests/navigation/resources/success200.html
@@ -18,7 +18,6 @@ be long enough that we can test saving and restoring of scroll position.
<form id="testform" action="postresult.pl" method="post">
<input type="submit" name="submitwithpost" value="Submit with POST"/><br>
<input type="submit" name="submitwithpostredirect" value="Submit with POST followed by a redirect"/><br>
-<input type="submit" name="submitwithpostredirectreload" value="Submit with POST followed by a redirect + reload"/><br>
Here are some form elements<input type="text" name="textfield1" value="Initial text before user input"/><br>
that we can use for testing<input type="text" name="textfield2" value=""/><br>
<input type="radio" name="radiogroup1" id="radiooption1" value="male"/> Male<br>
diff --git a/LayoutTests/http/tests/navigation/resources/testcode.js b/LayoutTests/http/tests/navigation/resources/testcode.js
index d43491e..adaa1b5 100644
--- a/LayoutTests/http/tests/navigation/resources/testcode.js
+++ b/LayoutTests/http/tests/navigation/resources/testcode.js
@@ -38,12 +38,6 @@ function submitFormWithPostRedirect() {
testDoc.getElementById('testform').submitwithpostredirect.click();
}
-// utility function to make a form post, using the postredirect idiom
-function submitFormWithPostRedirectReload() {
- testDoc = (window.frames.length == 0) ? document : window.frames['main'].document;
- testDoc.getElementById('testform').submitwithpostredirectreload.click();
-}
-
// utility function to do a jump within the page to an anchor
function jumpToAnchor() {
testWin = (window.frames.length == 0) ? window : window.frames['main'];
@@ -155,15 +149,3 @@ function runLoadSameTest(testCase) {
layoutTestController.queueNonLoadingScript("scrollDocDown()");
layoutTestController.queueLoad(testCase);
}
-
-// A sequence testing a reload after a redirect. The goal is to check
-// that in a reload we use the method set by the redirect, GET,
-// instead of the original one, POST.
-function runRedirectReloadTest(testCase) {
- layoutTestController.dumpBackForwardList();
- layoutTestController.queueLoad(testCase);
- layoutTestController.queueNonLoadingScript("fillTestForm()");
- layoutTestController.queueNonLoadingScript("scrollDocDown()");
- layoutTestController.queueLoadingScript("submitFormWithPostRedirectReload()");
- layoutTestController.queueReload();
-}
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9b16167..10833fa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2009-10-04 Xan Lopez <xlopez at igalia.com>
+ Revert previous patch, as the newly added test breaks other tests.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::restartedCallback):
+
+2009-10-04 Xan Lopez <xlopez at igalia.com>
+
Reviewed by Gustova Noronha.
[GTK] performs a POST when refreshing a view that was obtained with a GET
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 2177bd2..0a521ef 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -198,7 +198,6 @@ static void restartedCallback(SoupMessage* msg, gpointer data)
ResourceRequest request = handle->request();
ResourceResponse response;
request.setURL(newURL);
- request.setHTTPMethod(msg->method);
fillResponseFromMessage(msg, &response);
if (d->client())
d->client()->willSendRequest(handle, request, response);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list