summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp')
-rw-r--r--WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp6
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();