<!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>[202766] 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/202766">202766</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-01 17:55:44 -0700 (Fri, 01 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Sending XHR with UTF8 encoded data shows garbled data in Resource sidebar
https://bugs.webkit.org/show_bug.cgi?id=159358
Patch by Johan K. Jensen <jj@johanjensen.dk> on 2016-07-01
Reviewed by Joseph Pecoraro.
Source/WebCore:
Test: http/tests/inspector/network/xhr-request-data-encoded-correctly.html
* inspector/InspectorNetworkAgent.cpp:
(WebCore::buildObjectForResourceRequest):
LayoutTests:
Based on Chromium patch:
<https://chromium.googlesource.com/chromium/src/+/bcbb663864624ab38b36731eb2edc839a90f9e65%5E%21/#F2>
* http/tests/inspector/network/xhr-request-data-encoded-correctly-expected.txt:
* http/tests/inspector/network/xhr-request-data-encoded-correctly.html:</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="#trunkSourceWebCoreinspectorInspectorNetworkAgentcpp">trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/http/tests/inspector/network/</li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkxhrrequestdataencodedcorrectlyexpectedtxt">trunk/LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkxhrrequestdataencodedcorrectlyhtml">trunk/LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202765 => 202766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-07-02 00:22:15 UTC (rev 202765)
+++ trunk/LayoutTests/ChangeLog        2016-07-02 00:55:44 UTC (rev 202766)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-01 Johan K. Jensen <jj@johanjensen.dk>
+
+ Web Inspector: Sending XHR with UTF8 encoded data shows garbled data in Resource sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=159358
+
+ Reviewed by Joseph Pecoraro.
+
+ Based on Chromium patch:
+ <https://chromium.googlesource.com/chromium/src/+/bcbb663864624ab38b36731eb2edc839a90f9e65%5E%21/#F2>
+
+ * http/tests/inspector/network/xhr-request-data-encoded-correctly-expected.txt:
+ * http/tests/inspector/network/xhr-request-data-encoded-correctly.html:
+
</ins><span class="cx"> 2016-07-01 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> "image-src" support is missing. We only support "-webkit-image-src"
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkxhrrequestdataencodedcorrectlyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly-expected.txt (0 => 202766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly-expected.txt         (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly-expected.txt        2016-07-02 00:55:44 UTC (rev 202766)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Tests XHR network resource payload is shown with correct encoding.
+
+
+== Running test suite: XHRWithRequestDataEncoding
+-- Running test case: XHRWithRequestDataIsEncodedCorrectly
+PASS: Resource should be created.
+PASS: Request data should have expected content.
+PASS: Resource load should finish.
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkxhrrequestdataencodedcorrectlyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly.html (0 => 202766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly.html         (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly.html        2016-07-02 00:55:44 UTC (rev 202766)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../resources/inspector-test.js"></script>
+<script>
+function createXHRResource() {
+ var request = new XMLHttpRequest();
+ request.open("POST", "resources/", true);
+ request.send("utf8=👍");
+}
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("XHRWithRequestDataEncoding");
+
+ suite.addTestCase({
+ name: "XHRWithRequestDataIsEncodedCorrectly",
+ description: "XHR with request data is encoded correctly.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createXHRResource()");
+ WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
+ let resource = event.data.resource;
+ InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
+ InspectorTest.expectThat(resource.requestData === "utf8=👍", "Request data should have expected content.");
+ resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFinish, (event) => {
+ InspectorTest.pass("Resource load should finish.");
+ resolve();
+ });
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Tests XHR network resource payload is shown with correct encoding.</p>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202765 => 202766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-02 00:22:15 UTC (rev 202765)
+++ trunk/Source/WebCore/ChangeLog        2016-07-02 00:55:44 UTC (rev 202766)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-01 Johan K. Jensen <jj@johanjensen.dk>
+
+ Web Inspector: Sending XHR with UTF8 encoded data shows garbled data in Resource sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=159358
+
+ Reviewed by Joseph Pecoraro.
+
+ Test: http/tests/inspector/network/xhr-request-data-encoded-correctly.html
+
+ * inspector/InspectorNetworkAgent.cpp:
+ (WebCore::buildObjectForResourceRequest):
+
</ins><span class="cx"> 2016-07-01 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> "image-src" support is missing. We only support "-webkit-image-src"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorNetworkAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (202765 => 202766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp        2016-07-02 00:22:15 UTC (rev 202765)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp        2016-07-02 00:55:44 UTC (rev 202766)
</span><span class="lines">@@ -205,8 +205,11 @@
</span><span class="cx"> .setMethod(request.httpMethod())
</span><span class="cx"> .setHeaders(buildObjectForHeaders(request.httpHeaderFields()))
</span><span class="cx"> .release();
</span><del>- if (request.httpBody() && !request.httpBody()->isEmpty())
- requestObject->setPostData(request.httpBody()->flattenToString());
</del><ins>+ if (request.httpBody() && !request.httpBody()->isEmpty()) {
+ Vector<char> bytes;
+ request.httpBody()->flatten(bytes);
+ requestObject->setPostData(String::fromUTF8WithLatin1Fallback(bytes.data(), bytes.size()));
+ }
</ins><span class="cx"> return requestObject;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>