Changeset 201593 in webkit

Timestamp:

Jun 1, 2016, 10:39:52 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Notify client immediately if network session doesn't exist for a synchronous XHR load.
​https://bugs.webkit.org/show_bug.cgi?id=158239
<rdar://problem/26344251>

Patch by Yongjun Zhang <​yongjun_zhang@apple.com> on 2016-06-01
Reviewed by Brady Eidson.

For a synchronous XHR load, if the network session doesn't exist, we should notify NetworkLoadClient.
Otherwise the Web process could hang when waiting for the synchronous load to finish.

• NetworkProcess/NetworkLoad.cpp:

(WebKit::NetworkLoad::NetworkLoad):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkLoad.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-01  Yongjun Zhang  <yongjun_zhang@apple.com>
+
+        Notify client immediately if network session doesn't exist for a synchronous XHR load.
+        https://bugs.webkit.org/show_bug.cgi?id=158239
+        <rdar://problem/26344251>
+
+        Reviewed by Brady Eidson.
+
+        For a synchronous XHR load, if the network session doesn't exist, we should notify NetworkLoadClient.
+        Otherwise the Web process could hang when waiting for the synchronous load to finish.
+
+        * NetworkProcess/NetworkLoad.cpp:
+        (WebKit::NetworkLoad::NetworkLoad):
+
 2016-05-31  Brian Burg  <bburg@apple.com>
   

trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp

@@ -58 +58 @@
         if (!parameters.defersLoading)
             m_task->resume();
-    } else
+    } else {
         WTFLogAlways("Attempted to create a NetworkLoad with a session (id=%" PRIu64 ") that does not exist.", parameters.sessionID.sessionID());
+        RunLoop::current().dispatch([this, url = parameters.request.url()] {
+            didCompleteWithError(internalError(url));
+        });
+    }
 #else
     m_handle = ResourceHandle::create(m_networkingContext.get(), parameters.request, this, parameters.defersLoading, parameters.contentSniffingPolicy == SniffContent);