Changeset 91306 in webkit

Timestamp:

Jul 19, 2011 2:56:38 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Sending a Ping-From header for cross-origin pings from non-HTTPS documents.
​https://bugs.webkit.org/show_bug.cgi?id=64789

Also a drive-by cleanup of whitespace.

Patch by Mike West <​mkwst@chromium.org> on 2011-07-19
Reviewed by Nate Chapin.

Source/WebCore:

• loader/PingLoader.cpp:

(WebCore::PingLoader::loadImage):
(WebCore::PingLoader::sendPing):

LayoutTests:

• http/tests/navigation/ping-cross-origin-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/navigation/ping-cross-origin-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/PingLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-19  Mike West  <mkwst@chromium.org>
+
+        Sending a `Ping-From` header for cross-origin pings from non-HTTPS documents.
+        https://bugs.webkit.org/show_bug.cgi?id=64789
+
+        Also a drive-by cleanup of whitespace.
+
+        Reviewed by Nate Chapin.
+
+        * http/tests/navigation/ping-cross-origin-expected.txt:
+
 2011-07-19  Gavin Barraclough  <barraclough@apple.com>
 

trunk/LayoutTests/http/tests/navigation/ping-cross-origin-expected.txt

@@ -1 +1 @@
 Ping sent successfully
 CONTENT_TYPE: text/ping
+HTTP_PING_FROM: http://127.0.0.1:8000/navigation/ping-cross-origin.html
 HTTP_PING_TO: http://127.0.0.1:8000/navigation/resources/check-ping.php
 HTTP_REFERER: http://127.0.0.1:8000/navigation/ping-cross-origin.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-19  Mike West  <mkwst@chromium.org>
+
+        Sending a `Ping-From` header for cross-origin pings from non-HTTPS documents.
+        https://bugs.webkit.org/show_bug.cgi?id=64789
+
+        Also a drive-by cleanup of whitespace.
+
+        Reviewed by Nate Chapin.
+
+        * loader/PingLoader.cpp:
+        (WebCore::PingLoader::loadImage):
+        (WebCore::PingLoader::sendPing):
+
 2011-07-15  Luke Zarko  <lukezarko@gmail.com>
 

trunk/Source/WebCore/loader/PingLoader.cpp

@@ -62 +62 @@
     frame->loader()->addExtraFieldsToSubresourceRequest(request);
     OwnPtr<PingLoader> pingLoader = adoptPtr(new PingLoader(frame, request));
-    
+
     // Leak the ping loader, since it will kill itself as soon as it receives a response.
     PingLoader* leakedPingLoader = pingLoader.leakPtr();
@@ -83 +83 @@
     FrameLoader::addHTTPOriginIfNeeded(request, sourceOrigin->toString());
     request.setHTTPHeaderField("Ping-To", destinationURL);
-    if (sourceOrigin->isSameSchemeHostPort(pingOrigin.get()))
-        request.setHTTPHeaderField("Ping-From", frame->document()->url());
-    else if (!SecurityOrigin::shouldHideReferrer(pingURL, frame->loader()->outgoingReferrer()))
+    if (!SecurityOrigin::shouldHideReferrer(pingURL, frame->loader()->outgoingReferrer())) {
+      request.setHTTPHeaderField("Ping-From", frame->document()->url());
+      if (!sourceOrigin->isSameSchemeHostPort(pingOrigin.get()))
         request.setHTTPReferrer(frame->loader()->outgoingReferrer());
+    }
     OwnPtr<PingLoader> pingLoader = adoptPtr(new PingLoader(frame, request));
-    
+
     // Leak the ping loader, since it will kill itself as soon as it receives a response.
     PingLoader* leakedPingLoader = pingLoader.leakPtr();