<!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>[169196] releases/WebKitGTK/webkit-2.4</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/169196">169196</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-22 04:59:42 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/169112">r169112</a> - [GTK] WebKitWebPage::send-request always pass a valid pointer for redirected response
https://bugs.webkit.org/show_bug.cgi?id=133119
Reviewed by Sergio Villar Senin.
Source/WebKit2:
The problem is that we were checking whether the passed in
WKURLResponseRef is NULL or not, but it's always a valid object
that can contain a NULL WebCore::ResourceResponse.
* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
(willSendRequestForFrame): Pass NULL as redirect-response
parameter of WebKitWebPage::send-request signal when the
WebCore::ResourceResponse of the passed in WKURLResponseRef is NULL.
Tools:
Check that redirect response parameter of
WebKitWebPage::send-request signal is NULL when not redirecting
and a valid WebKitURIResponse object when redirecting.
* TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
(testWebResourceSendRequest):
(serverCallback):
* TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
(sendRequestCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsChangeLog">releases/WebKitGTK/webkit-2.4/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestResourcescpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (169195 => 169196)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-05-22 11:54:24 UTC (rev 169195)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-05-22 11:59:42 UTC (rev 169196)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] WebKitWebPage::send-request always pass a valid pointer for redirected response
+ https://bugs.webkit.org/show_bug.cgi?id=133119
+
+ Reviewed by Sergio Villar Senin.
+
+ The problem is that we were checking whether the passed in
+ WKURLResponseRef is NULL or not, but it's always a valid object
+ that can contain a NULL WebCore::ResourceResponse.
+
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+ (willSendRequestForFrame): Pass NULL as redirect-response
+ parameter of WebKitWebPage::send-request signal when the
+ WebCore::ResourceResponse of the passed in WKURLResponseRef is NULL.
+
</ins><span class="cx"> 2014-04-28 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WK2][X11] NetscapePluginModule::scanPlugin() should write UTF-8 strings to stdout
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (169195 => 169196)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2014-05-22 11:54:24 UTC (rev 169195)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2014-05-22 11:59:42 UTC (rev 169196)
</span><span class="lines">@@ -163,7 +163,8 @@
</span><span class="cx"> static WKURLRequestRef willSendRequestForFrame(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLRequestRef wkRequest, WKURLResponseRef wkRedirectResponse, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(toImpl(wkRequest)->resourceRequest()));
</span><del>- GRefPtr<WebKitURIResponse> redirectResponse = wkRedirectResponse ? adoptGRef(webkitURIResponseCreateForResourceResponse(toImpl(wkRedirectResponse)->resourceResponse())) : 0;
</del><ins>+ const ResourceResponse& redirectResourceResponse = toImpl(wkRedirectResponse)->resourceResponse();
+ GRefPtr<WebKitURIResponse> redirectResponse = !redirectResourceResponse.isNull() ? adoptGRef(webkitURIResponseCreateForResourceResponse(redirectResourceResponse)) : nullptr;
</ins><span class="cx">
</span><span class="cx"> gboolean returnValue;
</span><span class="cx"> g_signal_emit(WEBKIT_WEB_PAGE(clientInfo), signals[SEND_REQUEST], 0, request.get(), redirectResponse.get(), &returnValue);
</span><span class="lines">@@ -179,7 +180,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><span class="cx"> message.set(String::fromUTF8("Request"), newRequest.get());
</span><del>- if (!toImpl(wkRedirectResponse)->resourceResponse().isNull())
</del><ins>+ if (!redirectResourceResponse.isNull())
</ins><span class="cx"> message.set(String::fromUTF8("RedirectResponse"), toImpl(wkRedirectResponse));
</span><span class="cx"> WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidSendRequestForResource"), ImmutableDictionary::create(std::move(message)).get());
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (169195 => 169196)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-05-22 11:54:24 UTC (rev 169195)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-05-22 11:59:42 UTC (rev 169196)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-05-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] WebKitWebPage::send-request always pass a valid pointer for redirected response
+ https://bugs.webkit.org/show_bug.cgi?id=133119
+
+ Reviewed by Sergio Villar Senin.
+
+ Check that redirect response parameter of
+ WebKitWebPage::send-request signal is NULL when not redirecting
+ and a valid WebKitURIResponse object when redirecting.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
+ (testWebResourceSendRequest):
+ (serverCallback):
+ * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
+ (sendRequestCallback):
+
</ins><span class="cx"> 2014-05-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix the build after r168707.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestResourcescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp (169195 => 169196)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2014-05-22 11:54:24 UTC (rev 169195)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2014-05-22 11:59:42 UTC (rev 169196)
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx">
</span><span class="cx"> // URI changed after a redirect.
</span><span class="cx"> test->setExpectedNewResourceURI(kServer->getURIForPath("/redirected.js"));
</span><del>- test->setExpectedNewResourceURIAfterRedirection(kServer->getURIForPath("/javascript.js"));
</del><ins>+ test->setExpectedNewResourceURIAfterRedirection(kServer->getURIForPath("/javascript-after-redirection.js"));
</ins><span class="cx"> test->loadURI(kServer->getURIForPath("redirected-javascript.html").data());
</span><span class="cx"> test->waitUntilResourceLoadFinished();
</span><span class="cx"> g_assert(test->m_resource);
</span><span class="lines">@@ -717,7 +717,7 @@
</span><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, kStyleCSS, strlen(kStyleCSS));
</span><span class="cx"> addCacheHTTPHeadersToResponse(message);
</span><span class="cx"> soup_message_headers_append(message->response_headers, "Content-Type", "text/css");
</span><del>- } else if (g_str_equal(path, "/javascript.js")) {
</del><ins>+ } else if (g_str_equal(path, "/javascript.js") || g_str_equal(path, "/javascript-after-redirection.js")) {
</ins><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, kJavascript, strlen(kJavascript));
</span><span class="cx"> soup_message_headers_append(message->response_headers, "Content-Type", "text/javascript");
</span><span class="cx"> soup_message_headers_append(message->response_headers, "Content-Disposition", "filename=JavaScript.js");
</span><span class="lines">@@ -754,7 +754,7 @@
</span><span class="cx"> soup_message_headers_append(message->response_headers, "Location", "/simple-style.css");
</span><span class="cx"> } else if (g_str_equal(path, "/redirected.js")) {
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_MOVED_PERMANENTLY);
</span><del>- soup_message_headers_append(message->response_headers, "Location", "/remove-this/javascript.js");
</del><ins>+ soup_message_headers_append(message->response_headers, "Location", "/remove-this/javascript-after-redirection.js");
</ins><span class="cx"> } else if (g_str_equal(path, "/redirected-to-cancel.js")) {
</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", "/cancel-this.js");
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (169195 => 169196)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2014-05-22 11:54:24 UTC (rev 169195)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2014-05-22 11:59:42 UTC (rev 169196)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> delayedSignalsQueue.append(adoptPtr(new DelayedSignal(URIChangedSignal, webkit_web_page_get_uri(webPage))));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static gboolean sendRequestCallback(WebKitWebPage*, WebKitURIRequest* request, WebKitURIResponse*, gpointer)
</del><ins>+static gboolean sendRequestCallback(WebKitWebPage*, WebKitURIRequest* request, WebKitURIResponse* redirectResponse, gpointer)
</ins><span class="cx"> {
</span><span class="cx"> const char* requestURI = webkit_uri_request_get_uri(request);
</span><span class="cx"> g_assert(requestURI);
</span><span class="lines">@@ -138,6 +138,17 @@
</span><span class="cx"> GUniquePtr<char> prefix(g_strndup(requestURI, strlen(requestURI) - strlen(suffix)));
</span><span class="cx"> GUniquePtr<char> newURI(g_strdup_printf("%s/javascript.js", prefix.get()));
</span><span class="cx"> webkit_uri_request_set_uri(request, newURI.get());
</span><ins>+ } else if (const char* suffix = g_strrstr(requestURI, "/remove-this/javascript-after-redirection.js")) {
+ // Redirected from /redirected.js, redirectResponse should be nullptr.
+ g_assert(WEBKIT_IS_URI_RESPONSE(redirectResponse));
+ g_assert(g_str_has_suffix(webkit_uri_response_get_uri(redirectResponse), "/redirected.js"));
+
+ GUniquePtr<char> prefix(g_strndup(requestURI, strlen(requestURI) - strlen(suffix)));
+ GUniquePtr<char> newURI(g_strdup_printf("%s/javascript-after-redirection.js", prefix.get()));
+ webkit_uri_request_set_uri(request, newURI.get());
+ } else if (g_str_has_suffix(requestURI, "/redirected.js")) {
+ // Original request, redirectResponse should be nullptr.
+ g_assert(!redirectResponse);
</ins><span class="cx"> } else if (g_str_has_suffix(requestURI, "/add-do-not-track-header")) {
</span><span class="cx"> SoupMessageHeaders* headers = webkit_uri_request_get_http_headers(request);
</span><span class="cx"> g_assert(headers);
</span></span></pre>
</div>
</div>
</body>
</html>