diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp')
| -rw-r--r-- | WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp index c66de33..800301a 100644 --- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp +++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp @@ -194,8 +194,10 @@ void SocketStreamHandle::chooseProxy() void SocketStreamHandle::chooseProxyFromArray(CFArrayRef proxyArray) { - if (!proxyArray) + if (!proxyArray) { m_connectionType = Direct; + return; + } CFIndex proxyArrayCount = CFArrayGetCount(proxyArray); @@ -565,7 +567,7 @@ void SocketStreamHandle::writeStreamCallback(CFStreamEventType type) break; } - ASSERT(m_state = Open); + ASSERT(m_state == Open); ASSERT(m_connectingSubstate == Connected); sendPendingData(); |