Unreviewed, manually rolling out r128175.
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Sep 2012 20:34:08 +0000 (20:34 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Sep 2012 20:34:08 +0000 (20:34 +0000)
The patch is causing crashes in debug builds.
http://trac.webkit.org/changeset/128175
https://bugs.webkit.org/show_bug.cgi?id=96284

Source/WebCore:

* platform/network/soup/ResourceResponseSoup.cpp:
(WebCore::ResourceResponse::updateFromSoupMessage):

LayoutTests:

* http/tests/misc/non-utf8-header-name-expected.txt: Removed.
* http/tests/misc/non-utf8-header-name.php: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@128221 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt [deleted file]
LayoutTests/http/tests/misc/non-utf8-header-name.php [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp

index d90c753..015e3a0 100644 (file)
@@ -1,3 +1,13 @@
+2012-09-11  Zan Dobersek  <zandobersek@gmail.com>
+
+        Unreviewed, manually rolling out r128175.
+        The patch is causing crashes in debug builds.
+        http://trac.webkit.org/changeset/128175
+        https://bugs.webkit.org/show_bug.cgi?id=96284
+
+        * http/tests/misc/non-utf8-header-name-expected.txt: Removed.
+        * http/tests/misc/non-utf8-header-name.php: Removed.
+
 2012-09-11  Adam Klein  <adamk@chromium.org>
 
         Unreviewed chromium gardening.
diff --git a/LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt b/LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt
deleted file mode 100644 (file)
index 0e57ab9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Test for bug 96284: Non UTF-8 HTTP headers do not cause a crash.
diff --git a/LayoutTests/http/tests/misc/non-utf8-header-name.php b/LayoutTests/http/tests/misc/non-utf8-header-name.php
deleted file mode 100644 (file)
index f662ebf..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-header('HTTP/1.1 200 OK');
-header('Ã: text/html');
-echo '<script>';
-echo '   if (window.testRunner)';
-echo '       testRunner.dumpAsText();';
-echo '</script>';
-echo '<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=96284">bug 96284</a>: Non UTF-8 HTTP headers do not cause a crash.</p>';
-?>
index 6644c23..37beb00 100644 (file)
@@ -1,3 +1,13 @@
+2012-09-11  Zan Dobersek  <zandobersek@gmail.com>
+
+        Unreviewed, manually rolling out r128175.
+        The patch is causing crashes in debug builds.
+        http://trac.webkit.org/changeset/128175
+        https://bugs.webkit.org/show_bug.cgi?id=96284
+
+        * platform/network/soup/ResourceResponseSoup.cpp:
+        (WebCore::ResourceResponse::updateFromSoupMessage):
+
 2012-09-11  James Robinson  <jamesr@chromium.org>
 
         Unreviewed, rolling out r128212.
index b7c048f..452108b 100644 (file)
@@ -69,7 +69,7 @@ void ResourceResponse::updateFromSoupMessage(SoupMessage* soupMessage)
 
     soup_message_headers_iter_init(&headersIter, soupMessage->response_headers);
     while (soup_message_headers_iter_next(&headersIter, &headerName, &headerValue))
-        m_httpHeaderFields.set(String::fromUTF8WithLatin1Fallback(headerName, strlen(headerName)),
+        m_httpHeaderFields.set(String::fromUTF8(headerName),
                                String::fromUTF8WithLatin1Fallback(headerValue, strlen(headerValue)));
 
     m_soupFlags = soup_message_get_flags(soupMessage);