<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161176] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161176">161176</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-31 00:28:17 -0800 (Tue, 31 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] willSendRequest doesn't work after a redirect
https://bugs.webkit.org/show_bug.cgi?id=126290
Reviewed by Martin Robinson.
Source/WebCore:
The problem is that we are creating the new soup request for the
redirect before calling ResourceHandleClient::willSendRequest() so
that any change made to the request by the client is ignored.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::doRedirect): Create the new soup request and soup
message for the redirect after calling willSendRequest() on the
client.
Source/WebKit2:
Add test cases to test send-request signal in case of
redirection.
* UIProcess/API/gtk/tests/TestResources.cpp:
(testWebResourceSendRequest):
(serverCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtktestsTestResourcescpp">trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161175 => 161176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-31 07:39:01 UTC (rev 161175)
+++ trunk/Source/WebCore/ChangeLog 2013-12-31 08:28:17 UTC (rev 161176)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-30 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] willSendRequest doesn't work after a redirect
+ https://bugs.webkit.org/show_bug.cgi?id=126290
+
+ Reviewed by Martin Robinson.
+
+ The problem is that we are creating the new soup request for the
+ redirect before calling ResourceHandleClient::willSendRequest() so
+ that any change made to the request by the client is ignored.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::doRedirect): Create the new soup request and soup
+ message for the redirect after calling willSendRequest() on the
+ client.
+
</ins><span class="cx"> 2013-12-30 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> InputType should return input renderers wrapped in RenderPtr.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (161175 => 161176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2013-12-31 07:39:01 UTC (rev 161175)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2013-12-31 08:28:17 UTC (rev 161176)
</span><span class="lines">@@ -502,12 +502,6 @@
</span><span class="cx"> } else
</span><span class="cx"> applyAuthenticationToRequest(handle, newRequest, true);
</span><span class="cx">
</span><del>- cleanupSoupRequestOperation(handle);
- if (!createSoupRequestAndMessageForHandle(handle, newRequest, true)) {
- d->client()->cannotShowURL(handle);
- return;
- }
-
</del><span class="cx"> // If we sent credentials with this request's URL, we don't want the response to carry them to
</span><span class="cx"> // the WebKit layer. They were only placed in the URL for the benefit of libsoup.
</span><span class="cx"> newRequest.removeCredentials();
</span><span class="lines">@@ -516,6 +510,18 @@
</span><span class="cx"> d->client()->willSendRequestAsync(handle, newRequest, d->m_response);
</span><span class="cx"> else
</span><span class="cx"> d->client()->willSendRequest(handle, newRequest, d->m_response);
</span><ins>+
+ cleanupSoupRequestOperation(handle);
+
+ // willSendRequest might cancel the load.
+ if (handle->cancelledOrClientless())
+ return;
+
+ if (!createSoupRequestAndMessageForHandle(handle, newRequest, true)) {
+ d->client()->cannotShowURL(handle);
+ return;
+ }
+
</ins><span class="cx"> handle->sendPendingRequest();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161175 => 161176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-31 07:39:01 UTC (rev 161175)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-31 08:28:17 UTC (rev 161176)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-30 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] willSendRequest doesn't work after a redirect
+ https://bugs.webkit.org/show_bug.cgi?id=126290
+
+ Reviewed by Martin Robinson.
+
+ Add test cases to test send-request signal in case of
+ redirection.
+
+ * UIProcess/API/gtk/tests/TestResources.cpp:
+ (testWebResourceSendRequest):
+ (serverCallback):
+
</ins><span class="cx"> 2013-12-30 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r161157, r161158, r161160, r161161,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtktestsTestResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp (161175 => 161176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp 2013-12-31 07:39:01 UTC (rev 161175)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp 2013-12-31 08:28:17 UTC (rev 161176)
</span><span class="lines">@@ -568,7 +568,10 @@
</span><span class="cx"> if (resource != m_resource)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- g_assert_cmpstr(webkit_uri_request_get_uri(request), ==, m_expectedNewResourceURI.data());
</del><ins>+ if (redirectResponse)
+ g_assert_cmpstr(webkit_uri_request_get_uri(request), ==, m_expectedNewResourceURIAfterRedirection.data());
+ else
+ g_assert_cmpstr(webkit_uri_request_get_uri(request), ==, m_expectedNewResourceURI.data());
</ins><span class="cx"> g_assert_cmpstr(webkit_uri_request_get_uri(request), ==, webkit_web_resource_get_uri(resource));
</span><span class="cx">
</span><span class="cx"> SingleResourceLoadTest::resourceSentRequest(resource, request, redirectResponse);
</span><span class="lines">@@ -595,8 +598,14 @@
</span><span class="cx"> m_expectedCancelledResourceURI = uri;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void setExpectedNewResourceURIAfterRedirection(const CString& uri)
+ {
+ m_expectedNewResourceURIAfterRedirection = uri;
+ }
+
</ins><span class="cx"> CString m_expectedNewResourceURI;
</span><span class="cx"> CString m_expectedCancelledResourceURI;
</span><ins>+ CString m_expectedNewResourceURIAfterRedirection;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static void testWebResourceSendRequest(SendRequestTest* test, gconstpointer)
</span><span class="lines">@@ -626,6 +635,36 @@
</span><span class="cx"> g_assert_cmpint(events[1], ==, SingleResourceLoadTest::Failed);
</span><span class="cx"> g_assert_cmpint(events[2], ==, SingleResourceLoadTest::Finished);
</span><span class="cx"> events.clear();
</span><ins>+
+ // URI changed after a redirect.
+ test->setExpectedNewResourceURI(kServer->getURIForPath("/redirected.js"));
+ test->setExpectedNewResourceURIAfterRedirection(kServer->getURIForPath("/javascript.js"));
+ test->loadURI(kServer->getURIForPath("redirected-javascript.html").data());
+ test->waitUntilResourceLoadFinished();
+ g_assert(test->m_resource);
+
+ g_assert_cmpint(events.size(), ==, 6);
+ g_assert_cmpint(events[0], ==, SingleResourceLoadTest::Started);
+ g_assert_cmpint(events[1], ==, SingleResourceLoadTest::SentRequest);
+ g_assert_cmpint(events[2], ==, SingleResourceLoadTest::Redirected);
+ g_assert_cmpint(events[3], ==, SingleResourceLoadTest::ReceivedResponse);
+ g_assert_cmpint(events[4], ==, SingleResourceLoadTest::ReceivedData);
+ g_assert_cmpint(events[5], ==, SingleResourceLoadTest::Finished);
+ events.clear();
+
+ // Cancel after a redirect.
+ test->setExpectedNewResourceURI(kServer->getURIForPath("/redirected-to-cancel.js"));
+ test->setExpectedCancelledResourceURI(kServer->getURIForPath("/redirected-to-cancel.js"));
+ test->loadURI(kServer->getURIForPath("/redirected-to-cancel.html").data());
+ test->waitUntilResourceLoadFinished();
+ g_assert(test->m_resource);
+
+ g_assert_cmpint(events.size(), ==, 4);
+ g_assert_cmpint(events[0], ==, SingleResourceLoadTest::Started);
+ g_assert_cmpint(events[1], ==, SingleResourceLoadTest::SentRequest);
+ g_assert_cmpint(events[2], ==, SingleResourceLoadTest::Failed);
+ g_assert_cmpint(events[3], ==, SingleResourceLoadTest::Finished);
+ events.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void addCacheHTTPHeadersToResponse(SoupMessage* message)
</span><span class="lines">@@ -688,6 +727,12 @@
</span><span class="cx"> } else if (g_str_equal(path, "/resource-to-cancel.html")) {
</span><span class="cx"> static const char* resourceToCancelHTML = "<html><head><script language='javascript' src='cancel-this.js'></script></head><body></body></html>";
</span><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, resourceToCancelHTML, strlen(resourceToCancelHTML));
</span><ins>+ } else if (g_str_equal(path, "/redirected-javascript.html")) {
+ static const char* javascriptRelativeHTML = "<html><head><script language='javascript' src='/redirected.js'></script></head><body></body></html>";
+ soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, javascriptRelativeHTML, strlen(javascriptRelativeHTML));
+ } else if (g_str_equal(path, "/redirected-to-cancel.html")) {
+ static const char* javascriptRelativeHTML = "<html><head><script language='javascript' src='/redirected-to-cancel.js'></script></head><body></body></html>";
+ soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, javascriptRelativeHTML, strlen(javascriptRelativeHTML));
</ins><span class="cx"> } else if (g_str_equal(path, "/blank.ico")) {
</span><span class="cx"> GOwnPtr<char> filePath(g_build_filename(Test::getWebKit1TestResoucesDir().data(), path, NULL));
</span><span class="cx"> char* contents;
</span><span class="lines">@@ -707,6 +752,12 @@
</span><span class="cx"> } else if (g_str_equal(path, "/redirected.css")) {
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_MOVED_PERMANENTLY);
</span><span class="cx"> soup_message_headers_append(message->response_headers, "Location", "/simple-style.css");
</span><ins>+ } else if (g_str_equal(path, "/redirected.js")) {
+ soup_message_set_status(message, SOUP_STATUS_MOVED_PERMANENTLY);
+ soup_message_headers_append(message->response_headers, "Location", "/remove-this/javascript.js");
+ } else if (g_str_equal(path, "/redirected-to-cancel.js")) {
+ soup_message_set_status(message, SOUP_STATUS_MOVED_PERMANENTLY);
+ soup_message_headers_append(message->response_headers, "Location", "/cancel-this.js");
</ins><span class="cx"> } else if (g_str_equal(path, "/invalid.css"))
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_CANT_CONNECT);
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>