[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:27:22 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit ff18e0676eb9e904120ff406bbae22896147d627
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 9 20:46:06 2009 +0000
2009-11-09 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Allow setting HTTP headers with empty value in XMLHTTPRequest
https://bugs.webkit.org/show_bug.cgi?id=31140
Test that XHR request can set http headers with no value.
* http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value-expected.txt: Added.
* http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value.html: Added.
2009-11-09 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Allow setting HTTP headers with empty value in XMLHTTPRequest
https://bugs.webkit.org/show_bug.cgi?id=31140
QtNetwork interprets null string as request to remove the header, not add it.
Replace null values with empty values before passing them to QtNetwork.
Test: http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value.html
* platform/network/qt/ResourceRequestQt.cpp:
(WebCore::ResourceRequest::toNetworkRequest):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50679 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b37de3f..2c44e19 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-09 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Allow setting HTTP headers with empty value in XMLHTTPRequest
+ https://bugs.webkit.org/show_bug.cgi?id=31140
+
+ Test that XHR request can set http headers with no value.
+
+ * http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value-expected.txt: Added.
+ * http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value.html: Added.
+
2009-11-09 Mark Mentovai <mark at chromium.org>
Reviewed by Dan Bernstein.
diff --git a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value-expected.txt b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value-expected.txt
new file mode 100644
index 0000000..ef47353
--- /dev/null
+++ b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value-expected.txt
@@ -0,0 +1,3 @@
+Test that setRequestHeader can be used to set headers that have a name, but no value.
+
+SUCCESS
diff --git a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value.html b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value.html
new file mode 100644
index 0000000..c625660
--- /dev/null
+++ b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value.html
@@ -0,0 +1,24 @@
+<html>
+<body>
+<p>Test that setRequestHeader can be used to set headers that have a name, but no value.</p>
+<pre id=result>FAIL: script didn't run or raised an unexpected exception.</pre>
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ req = new XMLHttpRequest;
+ req.open("GET", "resources/print-headers.cgi", false);
+
+ req.setRequestHeader("CUSTOM_HEADER", "");
+ try {
+ req.send("");
+ if (req.responseText.indexOf("HTTP_CUSTOM_HEADER") >= 0)
+ document.getElementById("result").textContent = "SUCCESS";
+ else
+ document.getElementById("result").textContent = req.responseText;
+ } catch (ex) {
+ document.getElementById("result").textContent = ex;
+ }
+</script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 67b5848..4190aa8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-09 Yael Aharon <yael.aharon at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Allow setting HTTP headers with empty value in XMLHTTPRequest
+ https://bugs.webkit.org/show_bug.cgi?id=31140
+
+ QtNetwork interprets null string as request to remove the header, not add it.
+ Replace null values with empty values before passing them to QtNetwork.
+
+ Test: http/tests/xmlhttprequest/xmlhttprequest-setrequestheader-no-value.html
+
+ * platform/network/qt/ResourceRequestQt.cpp:
+ (WebCore::ResourceRequest::toNetworkRequest):
+
2009-11-09 Vadim Zeitlin <vadim at wxwidgets.org>
Reviewed by Kevin Ollivier.
diff --git a/WebCore/platform/network/qt/ResourceRequestQt.cpp b/WebCore/platform/network/qt/ResourceRequestQt.cpp
index c866a54..a183c40 100644
--- a/WebCore/platform/network/qt/ResourceRequestQt.cpp
+++ b/WebCore/platform/network/qt/ResourceRequestQt.cpp
@@ -41,7 +41,12 @@ QNetworkRequest ResourceRequest::toNetworkRequest(QObject* originatingFrame) con
it != end; ++it) {
QByteArray name = QString(it->first).toAscii();
QByteArray value = QString(it->second).toAscii();
- request.setRawHeader(name, value);
+ // QNetworkRequest::setRawHeader() would remove the header if the value is null
+ // Make sure to set an empty header instead of null header.
+ if (!value.isNull())
+ request.setRawHeader(name, value);
+ else
+ request.setRawHeader(name, "");
}
switch (cachePolicy()) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list