Title: [128302] trunk
- Revision
- 128302
- Author
- zandober...@gmail.com
- Date
- 2012-09-12 06:17:15 -0700 (Wed, 12 Sep 2012)
Log Message
Unreviewed, rolling out r128221.
http://trac.webkit.org/changeset/128221
https://bugs.webkit.org/show_bug.cgi?id=96504
The rollout was incorrect. (Requested by zdobersek on
#webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-09-12
Source/WebCore:
* platform/network/soup/ResourceResponseSoup.cpp:
(WebCore::ResourceResponse::updateFromSoupMessage):
LayoutTests:
* http/tests/misc/non-utf8-header-name-expected.txt: Added.
* http/tests/misc/non-utf8-header-name.php: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (128301 => 128302)
--- trunk/LayoutTests/ChangeLog 2012-09-12 13:16:31 UTC (rev 128301)
+++ trunk/LayoutTests/ChangeLog 2012-09-12 13:17:15 UTC (rev 128302)
@@ -1,5 +1,17 @@
2012-09-12 Sheriff Bot <webkit.review....@gmail.com>
+ Unreviewed, rolling out r128221.
+ http://trac.webkit.org/changeset/128221
+ https://bugs.webkit.org/show_bug.cgi?id=96504
+
+ The rollout was incorrect. (Requested by zdobersek on
+ #webkit).
+
+ * http/tests/misc/non-utf8-header-name-expected.txt: Added.
+ * http/tests/misc/non-utf8-header-name.php: Added.
+
+2012-09-12 Sheriff Bot <webkit.review....@gmail.com>
+
Unreviewed, rolling out r128280.
http://trac.webkit.org/changeset/128280
https://bugs.webkit.org/show_bug.cgi?id=96498
Added: trunk/LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt (0 => 128302)
--- trunk/LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt 2012-09-12 13:17:15 UTC (rev 128302)
@@ -0,0 +1 @@
+Test for bug 96284: Non UTF-8 HTTP headers do not cause a crash.
Added: trunk/LayoutTests/http/tests/misc/non-utf8-header-name.php (0 => 128302)
--- trunk/LayoutTests/http/tests/misc/non-utf8-header-name.php (rev 0)
+++ trunk/LayoutTests/http/tests/misc/non-utf8-header-name.php 2012-09-12 13:17:15 UTC (rev 128302)
@@ -0,0 +1,9 @@
+<?php
+header('HTTP/1.1 200 OK');
+header('\xC3: text/html');
+echo '<script>';
+echo ' if (window.testRunner)';
+echo ' testRunner.dumpAsText();';
+echo '</script>';
+echo '<p>Test for <a href="" 96284</a>: Non UTF-8 HTTP headers do not cause a crash.</p>';
+?>
Modified: trunk/Source/WebCore/ChangeLog (128301 => 128302)
--- trunk/Source/WebCore/ChangeLog 2012-09-12 13:16:31 UTC (rev 128301)
+++ trunk/Source/WebCore/ChangeLog 2012-09-12 13:17:15 UTC (rev 128302)
@@ -1,3 +1,15 @@
+2012-09-12 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r128221.
+ http://trac.webkit.org/changeset/128221
+ https://bugs.webkit.org/show_bug.cgi?id=96504
+
+ The rollout was incorrect. (Requested by zdobersek on
+ #webkit).
+
+ * platform/network/soup/ResourceResponseSoup.cpp:
+ (WebCore::ResourceResponse::updateFromSoupMessage):
+
2012-09-12 Ilya Tikhonovsky <loi...@chromium.org>
Unreviewed. Touch two files for fixing broken compile dependency on Apple Windows Debug bot.
Modified: trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp (128301 => 128302)
--- trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp 2012-09-12 13:16:31 UTC (rev 128301)
+++ trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp 2012-09-12 13:17:15 UTC (rev 128302)
@@ -69,7 +69,7 @@
soup_message_headers_iter_init(&headersIter, soupMessage->response_headers);
while (soup_message_headers_iter_next(&headersIter, &headerName, &headerValue))
- m_httpHeaderFields.set(String::fromUTF8(headerName),
+ m_httpHeaderFields.set(String::fromUTF8WithLatin1Fallback(headerName, strlen(headerName)),
String::fromUTF8WithLatin1Fallback(headerValue, strlen(headerValue)));
m_soupFlags = soup_message_get_flags(soupMessage);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
