Changeset 140338 in webkit

Timestamp:

Jan 21, 2013 8:23:13 AM (11 years ago)

Author:

danw@gnome.org

Message:

[Soup] Work around a glib bug
​https://bugs.webkit.org/show_bug.cgi?id=106789

Reviewed by Martin Robinson.

In glib <= 2.35.4, g_input_stream_skip_async() applied to a
libsoup response stream will do a synchronous skip() in another
thread, which libsoup isn't expecting and doesn't have proper
locking for. Work around this until the next time we bump the glib
requirement by using read_async() (and throwing away the result)
instead of skip_async().

No new tests; fixes a race condition in existing tests with older
glib

• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::redirectSkipCallback):
(WebCore::sendRequestCallback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-21  Dan Winship  <danw@gnome.org>
+
+        [Soup] Work around a glib bug
+        https://bugs.webkit.org/show_bug.cgi?id=106789
+
+        Reviewed by Martin Robinson.
+
+        In glib <= 2.35.4, g_input_stream_skip_async() applied to a
+        libsoup response stream will do a synchronous skip() in another
+        thread, which libsoup isn't expecting and doesn't have proper
+        locking for. Work around this until the next time we bump the glib
+        requirement by using read_async() (and throwing away the result)
+        instead of skip_async().
+
+        No new tests; fixes a race condition in existing tests with older
+        glib
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::redirectSkipCallback):
+        (WebCore::sendRequestCallback):
+
 2013-01-18  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -514 +514 @@
 
     GOwnPtr<GError> error;
-    gssize bytesSkipped = g_input_stream_skip_finish(d->m_inputStream.get(), asyncResult, &error.outPtr());
+    gssize bytesSkipped = g_input_stream_read_finish(d->m_inputStream.get(), asyncResult, &error.outPtr());
     if (error) {
         client->didFail(handle.get(), ResourceError::genericIOError(error.get(), d->m_soupRequest.get()));
@@ -522 +522 @@
 
     if (bytesSkipped > 0) {
-        g_input_stream_skip_async(d->m_inputStream.get(), G_MAXSSIZE, G_PRIORITY_DEFAULT,
+        g_input_stream_read_async(d->m_inputStream.get(), d->m_buffer, G_MAXSSIZE, G_PRIORITY_DEFAULT,
             d->m_cancellable.get(), redirectSkipCallback, handle.get());
         return;
@@ -669 +669 @@
     }
 
+    d->m_buffer = static_cast<char*>(g_slice_alloc(READ_BUFFER_SIZE));
+
     if (soupMessage) {
         if (SOUP_STATUS_IS_REDIRECTION(soupMessage->status_code) && shouldRedirect(handle.get())) {
             d->m_inputStream = inputStream;
-            g_input_stream_skip_async(d->m_inputStream.get(), G_MAXSSIZE, G_PRIORITY_DEFAULT,
+            // We use read_async() rather than skip_async() to work around
+            // https://bugzilla.gnome.org/show_bug.cgi?id=691489 until we can
+            // depend on glib > 2.35.4
+            g_input_stream_read_async(d->m_inputStream.get(), d->m_buffer, G_MAXSSIZE, G_PRIORITY_DEFAULT,
                 d->m_cancellable.get(), redirectSkipCallback, handle.get());
             return;
@@ -702 +707 @@
         return;
     }
-
-    d->m_buffer = static_cast<char*>(g_slice_alloc(READ_BUFFER_SIZE));
 
     if (soupMessage && d->m_response.isMultipart()) {