<!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>[178328] releases/WebKitGTK/webkit-2.6</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/178328">178328</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-13 01:11:17 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176930">r176930</a> - [Soup][Curl] HTTP header values should be treated as latin1, not UTF-8
https://bugs.webkit.org/show_bug.cgi?id=128739
Patch by Youenn Fablet <youenn.fablet@crf.canon.fr> on 2014-12-07
Reviewed by Martin Robinson.
Source/WebCore:
Removed UTF-8 conversion of HTTP header values (SOUP and CURL).
Removed unnecessary UTF-8 conversion of HTTP header names (SOUP).
Changed conversion of HTTP method from UTF-8 to ASCII (SOUP and CURL).
Added explicit UTF-8 conversion of Content-Disposition header to compute download suggested filename.
Test: http/tests/xmlhttprequest/response-special-characters.html
* platform/network/curl/CurlDownload.cpp:
(WebCore::CurlDownload::headerCallback): Removed header conversion.
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::headerCallback): Ditto.
(WebCore::ResourceHandleManager::initializeHandle): Changed HTTP method conversion to ASCI.
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateFromSoupMessageHeaders): Removed header conversion.
(WebCore::ResourceRequest::updateSoupMessage): Changed HTTP method conversion to ASCII.
(WebCore::ResourceRequest::toSoupMessage): Ditto.
(WebCore::ResourceRequest::updateFromSoupMessage):
* platform/network/soup/ResourceResponseSoup.cpp:
(WebCore::ResourceResponse::updateFromSoupMessageHeaders): Rmoved header conversion.
(WebCore::ResourceResponse::platformSuggestedFilename): Added explicit conversion of contentDisposition to UTF-8.
LayoutTests:
Tests that non ascii header & reason phrase values are correctly retrieved by the web application.
headers.php script sends a response that includes non ascii header value.
not-ascii-status.php sends a response that includes non ascii reason phrase.
Removed specific gtk/efl expectations as now aligned with regular expectation.
* http/tests/xmlhttprequest/resources/headers.php: Added.
* http/tests/xmlhttprequest/resources/not-ascii-status.php: Added.
* http/tests/xmlhttprequest/response-special-characters-expected.txt: Added.
* http/tests/xmlhttprequest/response-special-characters.html: Added.
* platform/efl/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt: Removed.
* platform/gtk/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformnetworkcurlCurlDownloadcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/curl/CurlDownload.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformnetworkcurlResourceHandleManagercpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformnetworksoupResourceRequestSoupcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformnetworksoupResourceResponseSoupcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestresourcesheadersphp">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/resources/headers.php</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestresourcesnotasciistatusphp">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/resources/not-ascii-status.php</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestresponsespecialcharactersexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/response-special-characters-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestresponsespecialcharactershtml">releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/response-special-characters.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformeflhttptestssecuritycontentSecurityPolicysourcelistparsingnonasciiexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/efl/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformgtkhttptestssecuritycontentSecurityPolicysourcelistparsingnonasciiexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (178327 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 09:07:17 UTC (rev 178327)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-12-07 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Soup][Curl] HTTP header values should be treated as latin1, not UTF-8
+ https://bugs.webkit.org/show_bug.cgi?id=128739
+
+ Reviewed by Martin Robinson.
+
+ Tests that non ascii header & reason phrase values are correctly retrieved by the web application.
+ headers.php script sends a response that includes non ascii header value.
+ not-ascii-status.php sends a response that includes non ascii reason phrase.
+ Removed specific gtk/efl expectations as now aligned with regular expectation.
+
+ * http/tests/xmlhttprequest/resources/headers.php: Added.
+ * http/tests/xmlhttprequest/resources/not-ascii-status.php: Added.
+ * http/tests/xmlhttprequest/response-special-characters-expected.txt: Added.
+ * http/tests/xmlhttprequest/response-special-characters.html: Added.
+ * platform/efl/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt: Removed.
+ * platform/gtk/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt: Removed.
+
</ins><span class="cx"> 2014-12-05 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (173394): Support for webcam is broken
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestresourcesheadersphp"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/resources/headers.php (0 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/resources/headers.php (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/resources/headers.php 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<?php
+ header("Content-Type: text/plain");
+ header("X-Custom-Header: test");
+ header("Set-Cookie: test");
+ header("Set-Cookie2: test");
+ header("X-Custom-Header-Empty:");
+ header("X-Custom-Header-Comma: 1");
+ header("X-Custom-Header-Comma: 2", false);
+ header("X-Custom-Header-Bytes: …");
+ echo "TEST";
+?>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestresourcesnotasciistatusphp"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/resources/not-ascii-status.php (0 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/resources/not-ascii-status.php (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/resources/not-ascii-status.php 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?php
+ header('HTTP/1.1 200 OK…');
+ echo "OK…";
+?>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestresponsespecialcharactersexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/response-special-characters-expected.txt (0 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/response-special-characters-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/response-special-characters-expected.txt 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+PASS non ascii response header value
+PASS non ascii statusText
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestshttptestsxmlhttprequestresponsespecialcharactershtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/response-special-characters.html (0 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/response-special-characters.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/http/tests/xmlhttprequest/response-special-characters.html 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>XMLHttpRequest: getting response with funny characters</title>
+ <script src="/js-test-resources/testharness.js"></script>
+ <script src="/js-test-resources/testharnessreport.js"></script>
+ <!-- test file originating from W3C web platform test suite -->
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ function run_test(name, setupFunction, assertFunction)
+ {
+ var test = async_test(name)
+ test.isAsserted = false
+ test.step(function() {
+ var client = new XMLHttpRequest()
+ client.onreadystatechange = function() {
+ test.step(function() {
+ if(client.readyState == 4) {
+ test.isAsserted = true
+ assertFunction(client)
+ }
+ })
+ }
+ client.onloadend = function() {
+ assert_true(test.isAsserted)
+ test.done()
+ }
+ setupFunction(client)
+ client.send(null)
+ })
+ }
+
+ run_test("non ascii response header value",
+ function(client){
+ client.open("GET", "resources/headers.php")
+ },function(client){
+ assert_equals(client.getResponseHeader("x-custom-header-bytes"), "\xE2\x80\xA6")
+ }
+ )
+
+ run_test("non ascii statusText",
+ function(client){
+ client.open("GET", "resources/not-ascii-status.php")
+ },function(client){
+ assert_equals(client.statusText, "OK\xE2\x80\xA6")
+ }
+ )
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformeflhttptestssecuritycontentSecurityPolicysourcelistparsingnonasciiexpectedtxt"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/efl/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt (178327 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/efl/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt 2015-01-13 09:07:17 UTC (rev 178327)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/efl/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-CONSOLE MESSAGE: The value for Content Security Policy directive 'script-src' contains an invalid character: '127.0.0.1/ßisnotSorB/'. Non-whitespace characters outside ASCII 0x21-0x7E must be percent-encoded, as described in RFC 3986, section 2.1: http://tools.ietf.org/html/rfc3986#section-2.1.
-Sources containing non-ascii characters should be ignored, and should generate warnings.
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformgtkhttptestssecuritycontentSecurityPolicysourcelistparsingnonasciiexpectedtxt"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt (178327 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt 2015-01-13 09:07:17 UTC (rev 178327)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/http/tests/security/contentSecurityPolicy/source-list-parsing-nonascii-expected.txt 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-CONSOLE MESSAGE: The value for Content Security Policy directive 'script-src' contains an invalid character: '127.0.0.1/ßisnotSorB/'. Non-whitespace characters outside ASCII 0x21-0x7E must be percent-encoded, as described in RFC 3986, section 2.1: http://tools.ietf.org/html/rfc3986#section-2.1.
-Sources containing non-ascii characters should be ignored, and should generate warnings.
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-PASS
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (178327 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 09:07:17 UTC (rev 178327)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-12-07 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [Soup][Curl] HTTP header values should be treated as latin1, not UTF-8
+ https://bugs.webkit.org/show_bug.cgi?id=128739
+
+ Reviewed by Martin Robinson.
+
+ Removed UTF-8 conversion of HTTP header values (SOUP and CURL).
+ Removed unnecessary UTF-8 conversion of HTTP header names (SOUP).
+ Changed conversion of HTTP method from UTF-8 to ASCII (SOUP and CURL).
+ Added explicit UTF-8 conversion of Content-Disposition header to compute download suggested filename.
+
+ Test: http/tests/xmlhttprequest/response-special-characters.html
+
+ * platform/network/curl/CurlDownload.cpp:
+ (WebCore::CurlDownload::headerCallback): Removed header conversion.
+ * platform/network/curl/ResourceHandleManager.cpp:
+ (WebCore::headerCallback): Ditto.
+ (WebCore::ResourceHandleManager::initializeHandle): Changed HTTP method conversion to ASCI.
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::updateFromSoupMessageHeaders): Removed header conversion.
+ (WebCore::ResourceRequest::updateSoupMessage): Changed HTTP method conversion to ASCII.
+ (WebCore::ResourceRequest::toSoupMessage): Ditto.
+ (WebCore::ResourceRequest::updateFromSoupMessage):
+ * platform/network/soup/ResourceResponseSoup.cpp:
+ (WebCore::ResourceResponse::updateFromSoupMessageHeaders): Rmoved header conversion.
+ (WebCore::ResourceResponse::platformSuggestedFilename): Added explicit conversion of contentDisposition to UTF-8.
+
</ins><span class="cx"> 2014-12-05 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Directional single quotation marks are not rotated in vertical text
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformnetworkcurlCurlDownloadcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/curl/CurlDownload.cpp (178327 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/curl/CurlDownload.cpp 2015-01-13 09:07:17 UTC (rev 178327)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/curl/CurlDownload.cpp 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> size_t totalSize = size * nmemb;
</span><span class="cx"> CurlDownload* download = reinterpret_cast<CurlDownload*>(data);
</span><span class="cx">
</span><del>- String header = String::fromUTF8WithLatin1Fallback(static_cast<const char*>(ptr), totalSize);
</del><ins>+ String header(static_cast<const char*>(ptr), totalSize);
</ins><span class="cx">
</span><span class="cx"> if (download)
</span><span class="cx"> download->didReceiveHeader(header);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (178327 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2015-01-13 09:07:17 UTC (rev 178327)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx"> size_t totalSize = size * nmemb;
</span><span class="cx"> ResourceHandleClient* client = d->client();
</span><span class="cx">
</span><del>- String header = String::fromUTF8WithLatin1Fallback(static_cast<const char*>(ptr), totalSize);
</del><ins>+ String header(static_cast<const char*>(ptr), totalSize);
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * a) We can finish and send the ResourceResponse
</span><span class="lines">@@ -1119,7 +1119,7 @@
</span><span class="cx"> else if ("HEAD" == method)
</span><span class="cx"> curl_easy_setopt(d->m_handle, CURLOPT_NOBODY, TRUE);
</span><span class="cx"> else {
</span><del>- curl_easy_setopt(d->m_handle, CURLOPT_CUSTOMREQUEST, method.latin1().data());
</del><ins>+ curl_easy_setopt(d->m_handle, CURLOPT_CUSTOMREQUEST, method.ascii().data());
</ins><span class="cx"> setupPUT(job, &headers);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformnetworksoupResourceRequestSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (178327 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2015-01-13 09:07:17 UTC (rev 178327)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -65,12 +65,12 @@
</span><span class="cx"> const char* headerName;
</span><span class="cx"> const char* headerValue;
</span><span class="cx"> while (soup_message_headers_iter_next(&headersIter, &headerName, &headerValue))
</span><del>- m_httpHeaderFields.set(String::fromUTF8(headerName), String::fromUTF8(headerValue));
</del><ins>+ m_httpHeaderFields.set(String(headerName), String(headerValue));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequest::updateSoupMessage(SoupMessage* soupMessage) const
</span><span class="cx"> {
</span><del>- g_object_set(soupMessage, SOUP_MESSAGE_METHOD, httpMethod().utf8().data(), NULL);
</del><ins>+ g_object_set(soupMessage, SOUP_MESSAGE_METHOD, httpMethod().ascii().data(), NULL);
</ins><span class="cx">
</span><span class="cx"> GUniquePtr<SoupURI> uri = createSoupURI();
</span><span class="cx"> soup_message_set_uri(soupMessage, uri.get());
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> SoupMessage* ResourceRequest::toSoupMessage() const
</span><span class="cx"> {
</span><del>- SoupMessage* soupMessage = soup_message_new(httpMethod().utf8().data(), url().string().utf8().data());
</del><ins>+ SoupMessage* soupMessage = soup_message_new(httpMethod().ascii().data(), url().string().utf8().data());
</ins><span class="cx"> if (!soupMessage)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> if (shouldPortBeResetToZero)
</span><span class="cx"> m_url.setPort(0);
</span><span class="cx">
</span><del>- m_httpMethod = String::fromUTF8(soupMessage->method);
</del><ins>+ m_httpMethod = String(soupMessage->method);
</ins><span class="cx">
</span><span class="cx"> updateFromSoupMessageHeaders(soupMessage->request_headers);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformnetworksoupResourceResponseSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp (178327 => 178328)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp 2015-01-13 09:07:17 UTC (rev 178327)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp 2015-01-13 09:11:17 UTC (rev 178328)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> soup_message_headers_iter_init(&headersIter, headers);
</span><span class="cx"> while (soup_message_headers_iter_next(&headersIter, &headerName, &headerValue))
</span><del>- addHTTPHeaderField(String::fromUTF8WithLatin1Fallback(headerName, strlen(headerName)), String::fromUTF8WithLatin1Fallback(headerValue, strlen(headerValue)));
</del><ins>+ addHTTPHeaderField(String(headerName), String(headerValue));
</ins><span class="cx">
</span><span class="cx"> String contentType;
</span><span class="cx"> const char* officialType = soup_message_headers_get_one(headers, "Content-Type");
</span><span class="lines">@@ -108,7 +108,8 @@
</span><span class="cx">
</span><span class="cx"> String ResourceResponse::platformSuggestedFilename() const
</span><span class="cx"> {
</span><del>- return filenameFromHTTPContentDisposition(httpHeaderField(HTTPHeaderName::ContentDisposition));
</del><ins>+ String contentDisposition(httpHeaderField(HTTPHeaderName::ContentDisposition));
+ return filenameFromHTTPContentDisposition(String::fromUTF8WithLatin1Fallback(contentDisposition.characters8(), contentDisposition.length()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>