Changeset 138351 in webkit

Timestamp:

Dec 20, 2012 11:25:01 PM (11 years ago)

Author:

ap@apple.com

Message:

Disable Nagle algorithm on WebSocket implementation for CF.
​https://bugs.webkit.org/show_bug.cgi?id=102079

Build fix. Disable the new code on Lion, _kCFStreamSocketSetNoDelay apparently
cannot be used on this OS version.

• platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::createStreams):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/SocketStreamHandleCFNet.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-20  Alexey Proskuryakov  <ap@apple.com>
+
+        Disable Nagle algorithm on WebSocket implementation for CF.
+        https://bugs.webkit.org/show_bug.cgi?id=102079
+
+        Build fix. Disable the new code on Lion, _kCFStreamSocketSetNoDelay apparently
+        cannot be used on this OS version.
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp:
+        (WebCore::SocketStreamHandle::createStreams):
+
 2012-12-20  KyungTae Kim  <ktf.kim@samsung.com>
 

trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp

@@ -54 +54 @@
 #endif
 
-#if !PLATFORM(WIN)
+#if !PLATFORM(WIN) && !BUILDING_ON_LION
 extern "C" const CFStringRef _kCFStreamSocketSetNoDelay;
 #endif
@@ -279 +279 @@
     CFWriteStreamRef writeStream = 0;
     CFStreamCreatePairWithSocketToHost(0, host.get(), port(), &readStream, &writeStream);
-#if !PLATFORM(WIN)
+#if !PLATFORM(WIN) && !BUILDING_ON_LION
     // <rdar://problem/12855587> _kCFStreamSocketSetNoDelay is not exported on Windows
     CFWriteStreamSetProperty(writeStream, _kCFStreamSocketSetNoDelay, kCFBooleanTrue);