Changeset 73489 in webkit

Timestamp:

Dec 7, 2010 8:33:10 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-07 Sergio Villar Senin <​svillar@igalia.com>

Reviewed by Xan Lopez.

[GTK] WebKitSoupCache fails to load resources when cache contents are externally removed
​https://bugs.webkit.org/show_bug.cgi?id=50577

Try to download cached resources again if they are no longer
accesible by the cache.

• platform/network/soup/cache/soup-request-http.c: (send_async_cb): (webkit_soup_request_http_send_async):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/cache/soup-request-http.c (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-07  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] WebKitSoupCache fails to load resources when cache contents are externally removed
+        https://bugs.webkit.org/show_bug.cgi?id=50577
+
+        Try to download cached resources again if they are no longer
+        accesible by the cache.
+
+        * platform/network/soup/cache/soup-request-http.c:
+        (send_async_cb):
+        (webkit_soup_request_http_send_async):
+
 2010-12-06  MORITA Hajime  <morrita@google.com>
 

trunk/WebCore/platform/network/soup/cache/soup-request-http.c

@@ -189 +189 @@
         GAsyncReadyCallback callback;
         gpointer user_data;
+        WebKitSoupHTTPInputStream *httpstream;
 } SendAsyncHelper;
 
@@ -200 +201 @@
 {
         GSimpleAsyncResult *simple;
-        WebKitSoupHTTPInputStream *httpstream;
-        SoupSession *session;
-        WebKitSoupCache *cache;
         SendAsyncHelper *helper = (SendAsyncHelper *)data;
-
-        session = webkit_soup_request_get_session (WEBKIT_SOUP_REQUEST (helper->http));
-        cache = (WebKitSoupCache *)soup_session_get_feature (session, WEBKIT_TYPE_SOUP_CACHE);
-
-        httpstream = (WebKitSoupHTTPInputStream *)webkit_soup_cache_send_response (cache, SOUP_MESSAGE (helper->http->priv->msg));
-
-        if (httpstream) {
-                const gchar *content_type;
-
-                simple = g_simple_async_result_new (G_OBJECT (helper->http),
-                                                    helper->callback, helper->user_data,
-                                                    webkit_soup_request_http_send_async);
-                g_simple_async_result_set_op_res_gpointer (simple, httpstream, g_object_unref);
-
-                /* Update message status */
-                soup_message_set_status (helper->http->priv->msg, SOUP_STATUS_OK);
-
-                /* Issue signals  */
-                soup_message_got_headers (helper->http->priv->msg);
-
-                /* FIXME: Uncomment this when this becomes part of libsoup
-                 * if (!soup_message_disables_feature(helper->http->priv->msg, SOUP_TYPE_CONTENT_SNIFFER)) {
-                 *      const gchar *content_type = soup_message_headers_get_content_type (helper->http->priv->msg->response_headers, NULL);
-                 *      soup_message_content_sniffed (helper->http->priv->msg, content_type, NULL);
-                 * }
-                 */
-                content_type = soup_message_headers_get_content_type (helper->http->priv->msg->response_headers, NULL);
-                soup_message_content_sniffed (helper->http->priv->msg, content_type, NULL);
-
-                g_simple_async_result_complete (simple);
-
-                soup_message_finished (helper->http->priv->msg);
-
-                g_object_unref (simple);
-        }
+        const gchar *content_type;
+
+        simple = g_simple_async_result_new (G_OBJECT (helper->http),
+                                            helper->callback, helper->user_data,
+                                            webkit_soup_request_http_send_async);
+        g_simple_async_result_set_op_res_gpointer (simple, helper->httpstream, g_object_unref);
+
+        /* Update message status */
+        soup_message_set_status (helper->http->priv->msg, SOUP_STATUS_OK);
+
+        /* Issue signals  */
+        soup_message_got_headers (helper->http->priv->msg);
+
+        /* FIXME: Uncomment this when this becomes part of libsoup
+         * if (!soup_message_disables_feature(helper->http->priv->msg, SOUP_TYPE_CONTENT_SNIFFER)) {
+         *      const gchar *content_type = soup_message_headers_get_content_type (helper->http->priv->msg->response_headers, NULL);
+         *      soup_message_content_sniffed (helper->http->priv->msg, content_type, NULL);
+         * }
+         */
+        content_type = soup_message_headers_get_content_type (helper->http->priv->msg->response_headers, NULL);
+        soup_message_content_sniffed (helper->http->priv->msg, content_type, NULL);
+
+        g_simple_async_result_complete (simple);
+
+        soup_message_finished (helper->http->priv->msg);
+
+        g_object_unref (simple);
 
         g_object_unref (helper->http);
@@ -266 +256 @@
                 response = webkit_soup_cache_has_response (cache, http->priv->msg);
                 if (response == WEBKIT_SOUP_CACHE_RESPONSE_FRESH) {
-                        /* Do return the stream asynchronously as in
-                           the other cases. It's not enough to use
-                           g_simple_async_result_complete_in_idle as
-                           the signals must be also emitted
-                           asynchronously */
-                        SendAsyncHelper *helper = g_slice_new (SendAsyncHelper);
-                        helper->http = g_object_ref (http);
-                        helper->callback = callback;
-                        helper->user_data = user_data;
-                        g_timeout_add (0, send_async_cb, helper);
-                        return;
+                        WebKitSoupHTTPInputStream *httpstream;
+
+                        httpstream = (WebKitSoupHTTPInputStream *)
+                                webkit_soup_cache_send_response (cache, SOUP_MESSAGE (http->priv->msg));
+
+                        /* Cached resource file could have been deleted outside
+                         */
+                        if (httpstream) {
+                                /* Do return the stream asynchronously as in
+                                 * the other cases. It's not enough to use
+                                 * g_simple_async_result_complete_in_idle as
+                                 * the signals must be also emitted
+                                 * asynchronously
+                                 */
+                                SendAsyncHelper *helper = g_slice_new (SendAsyncHelper);
+                                helper->http = g_object_ref (http);
+                                helper->callback = callback;
+                                helper->user_data = user_data;
+                                helper->httpstream = httpstream;
+                                g_timeout_add (0, send_async_cb, helper);
+                                return;
+                        }
                 } else if (response == WEBKIT_SOUP_CACHE_RESPONSE_NEEDS_VALIDATION) {
                         SoupMessage *conditional_msg;