Changeset 56035 in webkit

Timestamp:

Mar 15, 2010 9:58:55 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-15 Adam Bergkvist <​adam.bergkvist@ericsson.com>

Reviewed by Adam Barth.

According to the updated specification, a data field should always
result in a newline character being appended to the data buffer
regardless if the data buffer contains any data or not. However, upon
event dispatch, the last newline will be removed. This differs from an
older version of the specification where a newline character was
appended before the data value only if the buffer already contained
data. As a result, EventSource now supports receiving events with empty
data or newline characters only. Updated test accordingly.
​https://bugs.webkit.org/show_bug.cgi?id=33210

• http/tests/eventsource/eventsource-parse-event-stream-expected.txt:
• http/tests/eventsource/eventsource-parse-event-stream.html:
• http/tests/eventsource/resources/event-stream.php:

2010-03-15 Adam Bergkvist <​adam.bergkvist@ericsson.com>

Reviewed by Adam Barth.

According to the updated specification, a data field should always
result in a newline character being appended to the data buffer
regardless if the data buffer contains any data or not. However, upon
event dispatch, the last newline will be removed. This differs from an
older version of the specification where a newline character was
appended before the data value only if the buffer already contained
data. As a result, EventSource now supports receiving events with empty
data or newline characters only.
​https://bugs.webkit.org/show_bug.cgi?id=33210

• page/EventSource.cpp: (WebCore::EventSource::parseEventStreamLine):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/eventsource/eventsource-parse-event-stream-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/eventsource/eventsource-parse-event-stream.html (modified) (2 diffs)
• LayoutTests/http/tests/eventsource/resources/event-stream.php (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventSource.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-15  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        Reviewed by Adam Barth.
+
+        According to the updated specification, a data field should always
+        result in a newline character being appended to the data buffer
+        regardless if the data buffer contains any data or not. However, upon
+        event dispatch, the last newline will be removed. This differs from an
+        older version of the specification where a newline character was
+        appended before the data value only if the buffer already contained
+        data. As a result, EventSource now supports receiving events with empty
+        data or newline characters only. Updated test accordingly.
+        https://bugs.webkit.org/show_bug.cgi?id=33210
+
+        * http/tests/eventsource/eventsource-parse-event-stream-expected.txt:
+        * http/tests/eventsource/eventsource-parse-event-stream.html:
+        * http/tests/eventsource/resources/event-stream.php:
+
 2010-03-15  Valters Svabe  <vsvabe@gmail.com>
 

trunk/LayoutTests/http/tests/eventsource/eventsource-parse-event-stream-expected.txt

@@ -2 +2 @@
 
 PASS: got open event
+PASS: received event with two newlines
 PASS: received event with data "simple"
 PASS: received event with data spanning multiple lines

trunk/LayoutTests/http/tests/eventsource/eventsource-parse-event-stream.html

@@ -13 +13 @@
 }
 
-var count = 0;
+var count = -1;
 var es = new EventSource("resources/event-stream.php");
 
@@ -25 +25 @@
 es.onmessage = function (evt) {
     switch(count++) {
+        case -1:
+            if (evt.data == "\n\n")
+                log("PASS: received event with two newlines");
+            break;
         case 0:
             if (evt.data == "simple")

trunk/LayoutTests/http/tests/eventsource/resources/event-stream.php

@@ -13 +13 @@
 data:
 data
-: no dispatch since data buffer is empty
+: dispatch event with two newlines
 
 data: simple

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-15  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        Reviewed by Adam Barth.
+
+        According to the updated specification, a data field should always
+        result in a newline character being appended to the data buffer
+        regardless if the data buffer contains any data or not. However, upon
+        event dispatch, the last newline will be removed. This differs from an
+        older version of the specification where a newline character was
+        appended before the data value only if the buffer already contained
+        data. As a result, EventSource now supports receiving events with empty
+        data or newline characters only.
+        https://bugs.webkit.org/show_bug.cgi?id=33210
+
+        * page/EventSource.cpp:
+        (WebCore::EventSource::parseEventStreamLine):
+
 2010-03-15  Valters Svabe  <vsvabe@gmail.com>
 

trunk/WebCore/page/EventSource.cpp

@@ -251 +251 @@
 {
     if (!lineLength) {
-        if (!m_data.isEmpty())
+        if (!m_data.isEmpty()) {
+            m_data.removeLast();
             dispatchEvent(createMessageEvent());
+        }
         if (!m_eventName.isEmpty())
             m_eventName = "";
@@ -270 +272 @@
 
         if (field == "data") {
-            if (m_data.size() > 0)
-                m_data.append('\n');
             if (valueLength)
                 m_data.append(&m_receiveBuf[bufPos], valueLength);
+            m_data.append('\n');
         } else if (field == "event")
             m_eventName = valueLength ? String(&m_receiveBuf[bufPos], valueLength) : "";