<!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>[163017] trunk/Source/WebCore</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/163017">163017</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-29 06:52:22 -0800 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/162922">r162922</a>): [SOUP] Several tests are failing in EFL and GTK+ after <a href="http://trac.webkit.org/projects/webkit/changeset/162922">r162922</a>
https://bugs.webkit.org/show_bug.cgi?id=127836
Reviewed by Gustavo Noronha Silva.
The problem is that I assumed that several things done in
ResourceRequest::soupURI() were always desired, so I moved them to
URL. This patch restores the previous behaviour, so that those
tings are only done right before making a request.
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::createSoupURI):
* platform/soup/URLSoup.cpp:
(WebCore::URL::createSoupURI):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsoupURLSoupcpp">trunk/Source/WebCore/platform/soup/URLSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163016 => 163017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-29 14:24:08 UTC (rev 163016)
+++ trunk/Source/WebCore/ChangeLog 2014-01-29 14:52:22 UTC (rev 163017)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r162922): [SOUP] Several tests are failing in EFL and GTK+ after r162922
+ https://bugs.webkit.org/show_bug.cgi?id=127836
+
+ Reviewed by Gustavo Noronha Silva.
+
+ The problem is that I assumed that several things done in
+ ResourceRequest::soupURI() were always desired, so I moved them to
+ URL. This patch restores the previous behaviour, so that those
+ tings are only done right before making a request.
+
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::createSoupURI):
+ * platform/soup/URLSoup.cpp:
+ (WebCore::URL::createSoupURI):
+
</ins><span class="cx"> 2014-01-29 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Expose aria-describedby with ATK_RELATION_DESCRIBED_BY
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (163016 => 163017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-01-29 14:24:08 UTC (rev 163016)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-01-29 14:52:22 UTC (rev 163017)
</span><span class="lines">@@ -141,9 +141,36 @@
</span><span class="cx">
</span><span class="cx"> GUniquePtr<SoupURI> ResourceRequest::createSoupURI() const
</span><span class="cx"> {
</span><del>- URL url = m_url;
- url.removeFragmentIdentifier();
- return url.createSoupURI();
</del><ins>+ // WebKit does not support fragment identifiers in data URLs, but soup does.
+ // Before passing the URL to soup, we should make sure to urlencode any '#'
+ // characters, so that soup does not interpret them as fragment identifiers.
+ // See http://wkbug.com/68089
+ if (m_url.protocolIsData()) {
+ String urlString = m_url.string();
+ urlString.replace("#", "%23");
+ return GUniquePtr<SoupURI>(soup_uri_new(urlString.utf8().data()));
+ }
+
+ GUniquePtr<SoupURI> soupURI;
+ if (m_url.hasFragmentIdentifier()) {
+ URL url = m_url;
+ url.removeFragmentIdentifier();
+ soupURI.reset(soup_uri_new(url.string().utf8().data()));
+ } else
+ soupURI = m_url.createSoupURI();
+
+ // Versions of libsoup prior to 2.42 have a soup_uri_new that will convert empty passwords that are not
+ // prefixed by a colon into null. Some parts of soup like the SoupAuthenticationManager will only be active
+ // when both the username and password are non-null. When we have credentials, empty usernames and passwords
+ // should be empty strings instead of null.
+ String urlUser = m_url.user();
+ String urlPass = m_url.pass();
+ if (!urlUser.isEmpty() || !urlPass.isEmpty()) {
+ soup_uri_set_user(soupURI.get(), urlUser.utf8().data());
+ soup_uri_set_password(soupURI.get(), urlPass.utf8().data());
+ }
+
+ return soupURI;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsoupURLSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/soup/URLSoup.cpp (163016 => 163017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/soup/URLSoup.cpp 2014-01-29 14:24:08 UTC (rev 163016)
+++ trunk/Source/WebCore/platform/soup/URLSoup.cpp 2014-01-29 14:52:22 UTC (rev 163017)
</span><span class="lines">@@ -57,30 +57,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- // WebKit does not support fragment identifiers in data URLs, but soup does.
- // Before passing the URL to soup, we should make sure to urlencode any '#'
- // characters, so that soup does not interpret them as fragment identifiers.
- // See http://wkbug.com/68089
- if (protocolIsData()) {
- String urlString = string();
- urlString.replace("#", "%23");
- return GUniquePtr<SoupURI>(soup_uri_new(urlString.utf8().data()));
- }
-
- GUniquePtr<SoupURI> soupURI(soup_uri_new(string().utf8().data()));
-
- // Versions of libsoup prior to 2.42 have a soup_uri_new that will convert empty passwords that are not
- // prefixed by a colon into null. Some parts of soup like the SoupAuthenticationManager will only be active
- // when both the username and password are non-null. When we have credentials, empty usernames and passwords
- // should be empty strings instead of null.
- String urlUser = user();
- String urlPass = pass();
- if (!urlUser.isEmpty() || !urlPass.isEmpty()) {
- soup_uri_set_user(soupURI.get(), urlUser.utf8().data());
- soup_uri_set_password(soupURI.get(), urlPass.utf8().data());
- }
-
- return soupURI;
</del><ins>+ return GUniquePtr<SoupURI>(soup_uri_new(string().utf8().data()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>