Changeset 85207 in webkit

Timestamp:

Apr 28, 2011 10:49:20 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-28 Arno Renevier <​arno@renevier.net>

Reviewed by Gustavo Noronha Silva.

[Soup] does not load css stylesheets without content-type
​https://bugs.webkit.org/show_bug.cgi?id=59697

• platform/gtk/Skipped: Enable now passing tests:
  • http/tests/mime/standard-mode-loads-stylesheet-with-empty-content-type.html
  • http/tests/mime/standard-mode-loads-stylesheet-with-text-css-and-invalid-type.html

2011-04-28 Arno Renevier <​arno@renevier.net>

Reviewed by Gustavo Noronha Silva.

[Soup] does not load css stylesheets without content-type
​https://bugs.webkit.org/show_bug.cgi?id=59697

When sniffing content type, do not replace http Content-Type header in
soup message anymore, but keep sniffed content type in a separate
variable.

• platform/network/soup/ResourceHandleSoup.cpp: (WebCore::contentSniffedCallback):
• platform/network/soup/ResourceResponse.h: (WebCore::ResourceResponse::sniffedContentType): (WebCore::ResourceResponse::setSniffedContentType):
• platform/network/soup/ResourceResponseSoup.cpp: (WebCore::ResourceResponse::updateFromSoupMessage):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceResponse.h (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-28  Arno Renevier  <arno@renevier.net>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [Soup] does not load css stylesheets without content-type
+        https://bugs.webkit.org/show_bug.cgi?id=59697
+
+        * platform/gtk/Skipped: Enable now passing tests:
+         - http/tests/mime/standard-mode-loads-stylesheet-with-empty-content-type.html
+         - http/tests/mime/standard-mode-loads-stylesheet-with-text-css-and-invalid-type.html
+
 2011-04-28  Adam Roben  <aroben@apple.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -516 +516 @@
 http/tests/media/video-play-stall.html
 http/tests/media/video-seekable-stall.html
-http/tests/mime/standard-mode-loads-stylesheet-with-empty-content-type.html
-http/tests/mime/standard-mode-loads-stylesheet-with-text-css-and-invalid-type.html
 http/tests/misc/acid3.html
 http/tests/misc/link-rel-prefetch-and-subresource.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-28  Arno Renevier  <arno@renevier.net>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [Soup] does not load css stylesheets without content-type
+        https://bugs.webkit.org/show_bug.cgi?id=59697
+
+        When sniffing content type, do not replace http Content-Type header in
+        soup message anymore, but keep sniffed content type in a separate
+        variable.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::contentSniffedCallback):
+        * platform/network/soup/ResourceResponse.h:
+        (WebCore::ResourceResponse::sniffedContentType):
+        (WebCore::ResourceResponse::setSniffedContentType):
+        * platform/network/soup/ResourceResponseSoup.cpp:
+        (WebCore::ResourceResponse::updateFromSoupMessage):
+
 2011-04-28  Yael Aharon  <yael.aharon@nokia.com>
 

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

@@ -317 +317 @@
 static void contentSniffedCallback(SoupMessage* msg, const char* sniffedType, GHashTable *params, gpointer data)
 {
+
+    if (statusWillBeHandledBySoup(msg->status_code))
+        return;
+
+    RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
+    if (!handle)
+        return;
+    ResourceHandleInternal* d = handle->getInternal();
+    if (d->m_cancelled)
+        return;
+    ResourceHandleClient* client = handle->client();
+    if (!client)
+        return;
+
+    ASSERT(d->m_response.isNull());
+
     if (sniffedType) {
         const char* officialType = soup_message_headers_get_one(msg->response_headers, "Content-Type");
-
-        if (!officialType || strcmp(officialType, sniffedType))
-            soup_message_headers_set_content_type(msg->response_headers, sniffedType, params);
-    }
-
-    if (statusWillBeHandledBySoup(msg->status_code))
-        return;
-
-    RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
-    if (!handle)
-        return;
-    ResourceHandleInternal* d = handle->getInternal();
-    if (d->m_cancelled)
-        return;
-    ResourceHandleClient* client = handle->client();
-    if (!client)
-        return;
-
-    ASSERT(d->m_response.isNull());
+        if (!officialType || strcmp(officialType, sniffedType)) {
+            GString* str = g_string_new(sniffedType);
+            if (params) {
+                GHashTableIter iter;
+                gpointer key, value;
+                g_hash_table_iter_init(&iter, params);
+                while (g_hash_table_iter_next(&iter, &key, &value)) {
+                    g_string_append(str, "; ");
+                    soup_header_g_string_append_param(str, static_cast<const char*>(key), static_cast<const char*>(value));
+                }
+            }
+            d->m_response.setSniffedContentType(str->str);
+            g_string_free(str, TRUE);
+        }
+    }
 
     fillResponseFromMessage(msg, &d->m_response);

trunk/Source/WebCore/platform/network/soup/ResourceResponse.h

@@ -59 +59 @@
     void setSoupMessageFlags(SoupMessageFlags soupFlags) { m_soupFlags = soupFlags; }
 
+    const String& sniffedContentType() const { return m_sniffedContentType; }
+    void setSniffedContentType(const String& value) { m_sniffedContentType = value; }
+
 private:
     friend class ResourceResponseBase;
 
     SoupMessageFlags m_soupFlags;
+    String m_sniffedContentType;
 
     void doUpdateResourceResponse() { }

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

@@ -72 +72 @@
     m_soupFlags = soup_message_get_flags(soupMessage);
 
-    String contentType = soup_message_headers_get_one(soupMessage->response_headers, "Content-Type");
+    String contentType;
+    if (sniffedContentType().isEmpty())
+        contentType = soup_message_headers_get_one(soupMessage->response_headers, "Content-Type");
+    else
+        contentType = this->sniffedContentType();
     setMimeType(extractMIMETypeFromMediaType(contentType));