Changeset 227889 in webkit

Timestamp:

Jan 31, 2018, 1:09:42 AM (9 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r227770. rdar://problem/37019490

Location:

branches/safari-605-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/navigation-redirect.https-expected.txt (modified) (2 diffs)
• Source/WebCore/platform/network/HTTPHeaderMap.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp (modified) (1 diff)

branches/safari-605-branch/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-31  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r227770. rdar://problem/37019490
+
+    2018-01-29  Youenn Fablet  <youenn@apple.com>
+
+            ServiceWorkerClientFetch should not consider responses without Location headers as redirection responses
+            https://bugs.webkit.org/show_bug.cgi?id=182134
+
+            Reviewed by Chris Dumez.
+
+            * TestExpectations:
+
 2018-01-31  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/LayoutTests/TestExpectations

@@ -155 +155 @@
 imported/w3c/web-platform-tests/service-workers/service-worker/fetch-event-respond-with-partial-stream.https.html [ Skip ]
 imported/w3c/web-platform-tests/service-workers/service-worker/http-to-https-redirect-and-register.https.html [ Skip ]
-imported/w3c/web-platform-tests/service-workers/service-worker/navigation-redirect.https.html [ Skip ]
 imported/w3c/web-platform-tests/service-workers/service-worker/postmessage.https.html [ Skip ]
 imported/w3c/web-platform-tests/service-workers/service-worker/postmessage-msgport-to-client.https.html [ Skip ]

branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2018-01-31  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r227770. rdar://problem/37019490
+
+    2018-01-29  Youenn Fablet  <youenn@apple.com>
+
+            ServiceWorkerClientFetch should not consider responses without Location headers as redirection responses
+            https://bugs.webkit.org/show_bug.cgi?id=182134
+
+            Reviewed by Chris Dumez.
+
+            * web-platform-tests/service-workers/service-worker/navigation-redirect.https-expected.txt:
+
 2018-01-31  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/navigation-redirect.https-expected.txt

@@ -1 @@
-  
 
-Harness Error (TIMEOUT), message = null
 
 FAIL Normal redirect to same-origin scope. promise_test: Unhandled rejection with value: object "NotSupportedError: Passing MessagePort objects to postMessage is not yet supported"
@@ -25 +23 @@
 NOTRUN Redirect to other-origin out-scope with opaque redirect response. 
 NOTRUN Redirect to other-origin in-scope with opaque redirect response. 
-NOTRUN No location redirect response. 
-NOTRUN Redirect to same-origin out-scope with opaque redirect response which is passed through Cache. 
-NOTRUN Redirect to same-origin same-scope with opaque redirect response which is passed through Cache. 
-NOTRUN Redirect to same-origin other-scope with opaque redirect response which is passed through Cache. 
-NOTRUN Redirect to other-origin out-scope with opaque redirect response which is passed through Cache. 
-NOTRUN Redirect to other-origin in-scope with opaque redirect response which is passed through Cache. 
-NOTRUN No location redirect response via Cache. 
+PASS No location redirect response. 
+PASS Redirect to same-origin out-scope with opaque redirect response which is passed through Cache. 
+PASS Redirect to same-origin same-scope with opaque redirect response which is passed through Cache. 
+PASS Redirect to same-origin other-scope with opaque redirect response which is passed through Cache. 
+PASS Redirect to other-origin out-scope with opaque redirect response which is passed through Cache. 
+PASS Redirect to other-origin in-scope with opaque redirect response which is passed through Cache. 
 

branches/safari-605-branch/Source/WebCore/platform/network/HTTPHeaderMap.h

@@ -143 +143 @@
     void add(HTTPHeaderName, const String& value);
     bool addIfNotPresent(HTTPHeaderName, const String&);
-    bool contains(HTTPHeaderName) const;
+    WEBCORE_EXPORT bool contains(HTTPHeaderName) const;
     WEBCORE_EXPORT bool remove(HTTPHeaderName);
 

branches/safari-605-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-31  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r227770. rdar://problem/37019490
+
+    2018-01-29  Youenn Fablet  <youenn@apple.com>
+
+            ServiceWorkerClientFetch should not consider responses without Location headers as redirection responses
+            https://bugs.webkit.org/show_bug.cgi?id=182134
+
+            Reviewed by Chris Dumez.
+
+            As per fetch spec, a response with a redirection status code but no Location header should not be considered as a redirection.
+            This is also consistent with SubresourceLoader::didReceiveResponse.
+
+            * WebProcess/Storage/ServiceWorkerClientFetch.cpp:
+            (WebKit::ServiceWorkerClientFetch::didReceiveResponse):
+
 2018-01-31  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebKit/WebProcess/Storage/ServiceWorkerClientFetch.cpp

@@ -111 +111 @@
     response.setSource(ResourceResponse::Source::ServiceWorker);
 
-    if (response.isRedirection()) {
+    if (response.isRedirection() && response.httpHeaderFields().contains(HTTPHeaderName::Location)) {
         m_redirectionStatus = RedirectionStatus::Receiving;
-        // FIXME: Get shouldClearReferrerOnHTTPSToHTTPRedirect value from
         m_loader->willSendRequest(m_loader->request().redirectedRequest(response, m_shouldClearReferrerOnHTTPSToHTTPRedirect), response, [protectedThis = makeRef(*this), this](ResourceRequest&& request) {
             if (request.isNull() || !m_callback)