Changeset 202843 in webkit

Timestamp:

Jul 5, 2016 5:56:49 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

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-05
Reviewed by Joseph Pecoraro.

Source/WebCore:

Test: http/tests/inspector/network/xhr-request-data-encoded-correctly.html

• inspector/InspectorNetworkAgent.cpp:

(WebCore::buildObjectForResourceRequest):

• inspector/NetworkResourcesData.cpp:

(WebCore::NetworkResourcesData::setResourceContent):

LayoutTests:

• http/tests/inspector/network/xhr-request-data-encoded-correctly-expected.txt: Added.
• http/tests/inspector/network/xhr-request-data-encoded-correctly.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/network (added)
• LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly-expected.txt (added)
• LayoutTests/http/tests/inspector/network/xhr-request-data-encoded-correctly.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorNetworkAgent.cpp (modified) (1 diff)
• Source/WebCore/inspector/NetworkResourcesData.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-07-05  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.
+
+        * http/tests/inspector/network/xhr-request-data-encoded-correctly-expected.txt: Added.
+        * http/tests/inspector/network/xhr-request-data-encoded-correctly.html: Added.
+
 2016-07-05  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-05  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):
+        * inspector/NetworkResourcesData.cpp:
+        (WebCore::NetworkResourcesData::setResourceContent):
+
 2016-07-05  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp

@@ -206 +206 @@
         .setHeaders(buildObjectForHeaders(request.httpHeaderFields()))
         .release();
-    if (request.httpBody() && !request.httpBody()->isEmpty())
-        requestObject->setPostData(request.httpBody()->flattenToString());
+    if (request.httpBody() && !request.httpBody()->isEmpty()) {
+        Vector<char> bytes;
+        request.httpBody()->flatten(bytes);
+        requestObject->setPostData(String::fromUTF8WithLatin1Fallback(bytes.data(), bytes.size()));
+    }
     return requestObject;
 }

trunk/Source/WebCore/inspector/NetworkResourcesData.cpp

@@ -191 +191 @@
     if (ensureFreeSpace(dataLength) && !resourceData->isContentEvicted()) {
         // We can not be sure that we didn't try to save this request data while it was loading, so remove it, if any.
-        if (resourceData->hasContent())
+        if (resourceData->hasContent() || resourceData->hasData())
             m_contentSize -= resourceData->removeContent();
         m_requestIdsDeque.append(requestId);