Changeset 146922 in webkit

Timestamp:

Mar 26, 2013 1:04:25 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] In RSSFilterStream, don't swallow headers when there's no body
​https://bugs.webkit.org/show_bug.cgi?id=113334

Patch by Joe Mason <​jmason@blackberry.com> on 2013-03-26
Reviewed by Rob Buis.

RIM PR 316345

When receiving an HTTP response that has a Content-Type header such as text/xml, but no
body, RSSFilterStream::notifyHeadersReceived reads the Content-Type as "potential RSS", and
calls saveHeaders. It expects to sniff the body in notifyDataReceived to see if it's RSS,
and then call sendSavedHeaders to pass on the headers. But since there is no body,
notifyDataReceived is never called. So call sendSavedHeaders in notifyClose too (it will not
send them again if they were already sent.)

• platform/network/blackberry/rss/RSSFilterStream.cpp:

(WebCore::RSSFilterStream::notifyClose):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/blackberry/rss/RSSFilterStream.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-26  Joe Mason  <jmason@blackberry.com>
+
+        [BlackBerry] In RSSFilterStream, don't swallow headers when there's no body
+        https://bugs.webkit.org/show_bug.cgi?id=113334
+
+        Reviewed by Rob Buis.
+
+        RIM PR 316345
+
+        When receiving an HTTP response that has a Content-Type header such as text/xml, but no
+        body, RSSFilterStream::notifyHeadersReceived reads the Content-Type as "potential RSS", and
+        calls saveHeaders. It expects to sniff the body in notifyDataReceived to see if it's RSS,
+        and then call sendSavedHeaders to pass on the headers. But since there is no body,
+        notifyDataReceived is never called. So call sendSavedHeaders in notifyClose too (it will not
+        send them again if they were already sent.)
+
+        * platform/network/blackberry/rss/RSSFilterStream.cpp:
+        (WebCore::RSSFilterStream::notifyClose):
+
 2013-03-26  Dmitry Zvorygin  <zvorygin@chromium.org>
 

trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp

@@ -502 +502 @@
 void RSSFilterStream::notifyClose(int status)
 {
+    // If there was no data, we might get here with the type still unknown. No data at all -> no RSS
+    // data.
+    if (m_resourceType == TypeUnknown)
+        m_resourceType = TypeNotRSS;
+
     if (isRSSContent(m_resourceType))
         handleRSSContent();
-    else
+    else {
+        sendSavedHeaders();
         FilterStream::notifyClose(status);
+    }
 }