Changeset 77680 in webkit

Timestamp:

Feb 4, 2011 2:41:55 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-04 Martin Galpin <​martin@66laps.com>

Reviewed by David Levin.

CORS origin header not set on GET when a preflight request is required.
​https://bugs.webkit.org/show_bug.cgi?id=50773

• http/tests/xmlhttprequest/cross-origin-preflight-get-expected.txt: Added.
• http/tests/xmlhttprequest/cross-origin-preflight-get.html: Added.
• http/tests/xmlhttprequest/resources/cross-origin-preflight-get.php: Added.

2011-02-04 Martin Galpin <​martin@66laps.com>

Reviewed by David Levin.

CORS origin header not set on GET when a preflight request is required.
​https://bugs.webkit.org/show_bug.cgi?id=50773

Test: http/tests/xmlhttprequest/cross-origin-preflight-get.html

• loader/DocumentThreadableLoader.cpp: (WebCore::DocumentThreadableLoader::preflightSuccess): Explicitly set the request origin after a preflight request succeeds.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/xmlhttprequest/cross-origin-preflight-get-expected.txt (added)
• LayoutTests/http/tests/xmlhttprequest/cross-origin-preflight-get.html (added)
• LayoutTests/http/tests/xmlhttprequest/resources/cross-origin-preflight-get.php (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentThreadableLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-04  Martin Galpin  <martin@66laps.com>
+
+        Reviewed by David Levin.
+
+        CORS origin header not set on GET when a preflight request is required.
+        https://bugs.webkit.org/show_bug.cgi?id=50773
+
+        * http/tests/xmlhttprequest/cross-origin-preflight-get-expected.txt: Added.
+        * http/tests/xmlhttprequest/cross-origin-preflight-get.html: Added.
+        * http/tests/xmlhttprequest/resources/cross-origin-preflight-get.php: Added.
+
 2011-02-04  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-04  Martin Galpin  <martin@66laps.com>
+
+        Reviewed by David Levin.
+
+        CORS origin header not set on GET when a preflight request is required.
+        https://bugs.webkit.org/show_bug.cgi?id=50773
+        
+        Test: http/tests/xmlhttprequest/cross-origin-preflight-get.html
+
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::preflightSuccess): 
+        Explicitly set the request origin after a preflight request succeeds.
+
 2011-02-04  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -299 +299 @@
     actualRequest.swap(m_actualRequest);
 
+    actualRequest->setHTTPOrigin(m_document->securityOrigin()->toString());
+
     // It should be ok to skip the security check since we already asked about the preflight request.
     loadRequest(*actualRequest, SkipSecurityCheck);