<!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>[170530] trunk</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/170530">170530</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-27 09:01:33 -0700 (Fri, 27 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[XHR] open method must uppercase only standard method types
https://bugs.webkit.org/show_bug.cgi?id=134264
Patch by Mahesh Kulkarni <mahesh.kk@samsung.com> on 2014-06-27
Reviewed by Darin Adler.
Source/WebCore:
As per step-5 of http://xhr.spec.whatwg.org/#the-open()-method only
DELETE, PUT, GET, POST, OPTIONS, HEAD are standard. Use other methods as is without case change.
All tests from w3c-test suite pass http://w3c-test.org/XMLHttpRequest/open-method-case-sensitive.htm.
This merges blink changes from <a href="http://trac.webkit.org/projects/webkit/changeset/176592">r176592</a>.
Tests: http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed.html
http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive.html
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::uppercaseKnownHTTPMethod):
LayoutTests:
All tests from w3c-test suite pass http://w3c-test.org/XMLHttpRequest/open-method-case-sensitive.htm.
This merges blink changes from <a href="http://trac.webkit.org/projects/webkit/changeset/176592">r176592</a>.
* http/tests/xmlhttprequest/resources/echo-request-method.php: Added.
* http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed-expected.txt: Added.
* http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed.html: Added.
* http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive-expected.txt: Added.
* http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestresourcesechorequestmethodphp">trunk/LayoutTests/http/tests/xmlhttprequest/resources/echo-request-method.php</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestopenmethodallowedexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestopenmethodallowedhtml">trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestopenmethodcaseinsensitiveexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestopenmethodcaseinsensitivehtml">trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170529 => 170530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-27 15:51:01 UTC (rev 170529)
+++ trunk/LayoutTests/ChangeLog 2014-06-27 16:01:33 UTC (rev 170530)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-06-27 Mahesh Kulkarni <mahesh.kk@samsung.com>
+
+ [XHR] open method must uppercase only standard method types
+ https://bugs.webkit.org/show_bug.cgi?id=134264
+
+ Reviewed by Darin Adler.
+
+ All tests from w3c-test suite pass http://w3c-test.org/XMLHttpRequest/open-method-case-sensitive.htm.
+ This merges blink changes from r176592.
+
+ * http/tests/xmlhttprequest/resources/echo-request-method.php: Added.
+ * http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed-expected.txt: Added.
+ * http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed.html: Added.
+ * http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive-expected.txt: Added.
+ * http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive.html: Added.
+
</ins><span class="cx"> 2014-06-26 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> iOS 8 beta 2 ES6 'Set' clear() broken
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestresourcesechorequestmethodphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/resources/echo-request-method.php (0 => 170530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/resources/echo-request-method.php (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resources/echo-request-method.php 2014-06-27 16:01:33 UTC (rev 170530)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?php
+if ($_SERVER['REQUEST_METHOD'])
+ header("X-CUSTOM-REQUEST-METHOD: " . $_SERVER['REQUEST_METHOD']);
+else
+ header("X-CUSTOM-REQUEST-METHOD: NOT_SET");
+?>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestopenmethodallowedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed-expected.txt (0 => 170530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed-expected.txt 2014-06-27 16:01:33 UTC (rev 170530)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Valid methods per step-5 of http://xhr.spec.whatwg.org/#the-open()-method.
+
+
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 1
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 2
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 3
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 4
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 5
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 6
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 7
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 8
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 9
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 10
+PASS XMLHttpRequest: open() - allowed case in/sensitive methods test 11
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestopenmethodallowedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed.html (0 => 170530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed.html 2014-06-27 16:01:33 UTC (rev 170530)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>XMLHttpRequest: open() - allowed case in/sensitive methods test</title>
+ <script src="../w3c/resources/testharness.js"></script>
+ <script src="../w3c/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <p>Valid methods per step-5 of http://xhr.spec.whatwg.org/#the-open()-method.</p>
+ <script type="text/javascript">
+ function testMethod(methodName) {
+ var client = new XMLHttpRequest();
+ client.open(methodName, "resources/echo-request-method.php");
+ client.onreadystatechange = function(event) {
+ if (event.target.readyState == 4)
+ assert_equals(client.getResponseHeader("x-custom-request-method"), methodName.toUpperCase());
+ }
+ client.send(null);
+ }
+
+ test(function() { testMethod("PUT"); });
+ test(function() { testMethod("Put"); });
+ test(function() { testMethod("DELETE"); });
+ test(function() { testMethod("DeLeTe"); });
+ test(function() { testMethod("HEAD"); });
+ test(function() { testMethod("hEAd"); });
+ test(function() { testMethod("OPTIONS"); });
+ test(function() { testMethod("OPtiOns"); });
+ test(function() { testMethod("POST"); });
+ test(function() { testMethod("post"); });
+ test(function() { testMethod("GET"); });
+ test(function() { testMethod("gEt"); });
+ </script>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestopenmethodcaseinsensitiveexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive-expected.txt (0 => 170530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive-expected.txt 2014-06-27 16:01:33 UTC (rev 170530)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+non-standard method names should be returned as is per step-5 of http://xhr.spec.whatwg.org/#the-open()-method.
+
+
+PASS XMLHttpRequest: open() - case-insensitive methods test
+PASS XMLHttpRequest: open() - case-insensitive methods test 1
+PASS XMLHttpRequest: open() - case-insensitive methods test 2
+PASS XMLHttpRequest: open() - case-insensitive methods test 3
+PASS XMLHttpRequest: open() - case-insensitive methods test 4
+PASS XMLHttpRequest: open() - case-insensitive methods test 5
+PASS XMLHttpRequest: open() - case-insensitive methods test 6
+PASS XMLHttpRequest: open() - case-insensitive methods test 7
+PASS XMLHttpRequest: open() - case-insensitive methods test 8
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestopenmethodcaseinsensitivehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive.html (0 => 170530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive.html 2014-06-27 16:01:33 UTC (rev 170530)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>XMLHttpRequest: open() - case-insensitive methods test</title>
+ <script src="../w3c/resources/testharness.js"></script>
+ <script src="../w3c/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <p>non-standard method names should be returned as is per step-5 of http://xhr.spec.whatwg.org/#the-open()-method.</p>
+ <script type="text/javascript">
+ function testMethod(methodName, lastTest) {
+ var client = new XMLHttpRequest();
+ client.open(methodName, "resources/echo-request-method.php");
+ client.onreadystatechange = function(event) {
+ if (event.target.readyState == 4)
+ assert_equals(client.getResponseHeader("x-custom-request-method"), methodName);
+ }
+ client.send(null);
+ }
+
+ test(function() { testMethod("XUNICORN"); });
+ test(function() { testMethod("xUNIcorn"); });
+ test(function() { testMethod("chiCKEN"); });
+ test(function() { testMethod("PATCH"); });
+ test(function() { testMethod("patCH"); });
+ test(function() { testMethod("copy"); });
+ test(function() { testMethod("COpy"); });
+ test(function() { testMethod("inDEX"); });
+ test(function() { testMethod("movE"); });
+ </script>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170529 => 170530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-27 15:51:01 UTC (rev 170529)
+++ trunk/Source/WebCore/ChangeLog 2014-06-27 16:01:33 UTC (rev 170530)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-06-27 Mahesh Kulkarni <mahesh.kk@samsung.com>
+
+ [XHR] open method must uppercase only standard method types
+ https://bugs.webkit.org/show_bug.cgi?id=134264
+
+ Reviewed by Darin Adler.
+
+ As per step-5 of http://xhr.spec.whatwg.org/#the-open()-method only
+ DELETE, PUT, GET, POST, OPTIONS, HEAD are standard. Use other methods as is without case change.
+ All tests from w3c-test suite pass http://w3c-test.org/XMLHttpRequest/open-method-case-sensitive.htm.
+ This merges blink changes from r176592.
+
+ Tests: http/tests/xmlhttprequest/xmlhttprequest-open-method-allowed.html
+ http/tests/xmlhttprequest/xmlhttprequest-open-method-case-insensitive.html
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::uppercaseKnownHTTPMethod):
+
</ins><span class="cx"> 2014-06-27 Andre Moreira Magalhaes <andre.magalhaes@collabora.co.uk>
</span><span class="cx">
</span><span class="cx"> Increase priority on SharedTimer source.
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (170529 => 170530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-27 15:51:01 UTC (rev 170529)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-27 16:01:33 UTC (rev 170530)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx">
</span><span class="cx"> String XMLHttpRequest::uppercaseKnownHTTPMethod(const String& method)
</span><span class="cx"> {
</span><del>- const char* const methods[] = { "COPY", "DELETE", "GET", "HEAD", "INDEX", "LOCK", "M-POST", "MKCOL", "MOVE", "OPTIONS", "POST", "PROPFIND", "PROPPATCH", "PUT", "UNLOCK" };
</del><ins>+ const char* const methods[] = { "DELETE", "GET", "HEAD", "OPTIONS", "POST", "PUT" };
</ins><span class="cx"> for (unsigned i = 0; i < WTF_ARRAY_LENGTH(methods); ++i) {
</span><span class="cx"> if (equalIgnoringCase(method, methods[i])) {
</span><span class="cx"> // Don't bother allocating a new string if it's already all uppercase.
</span></span></pre>
</div>
</div>
</body>
</html>