summaryrefslogtreecommitdiffstats
path: root/WebCore/page/EventSource.cpp
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-12-07 17:22:45 -0800
committerShimeng (Simon) Wang <swang@google.com>2010-12-22 14:15:40 -0800
commit4576aa36e9a9671459299c7963ac95aa94beaea9 (patch)
tree3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/page/EventSource.cpp
parent55323ac613cc31553107b68603cb627264d22bb0 (diff)
downloadexternal_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip
external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz
external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/page/EventSource.cpp')
-rw-r--r--WebCore/page/EventSource.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/page/EventSource.cpp b/WebCore/page/EventSource.cpp
index a7c715a..b0b07aa 100644
--- a/WebCore/page/EventSource.cpp
+++ b/WebCore/page/EventSource.cpp
@@ -120,6 +120,9 @@ void EventSource::connect()
void EventSource::endRequest()
{
+ if (!m_requestInFlight)
+ return;
+
m_requestInFlight = false;
if (!m_failSilently)