Title: [138352] trunk/Source/WebCore
- Revision
- 138352
- Author
- rn...@webkit.org
- Date
- 2012-12-20 23:40:23 -0800 (Thu, 20 Dec 2012)
Log Message
More fix after r138348.
* platform/network/cf/SocketStreamHandleCFNet.cpp:
(WebCore::SocketStreamHandle::createStreams):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138351 => 138352)
--- trunk/Source/WebCore/ChangeLog 2012-12-21 07:25:01 UTC (rev 138351)
+++ trunk/Source/WebCore/ChangeLog 2012-12-21 07:40:23 UTC (rev 138352)
@@ -1,3 +1,10 @@
+2012-12-20 Ryosuke Niwa <rn...@webkit.org>
+
+ More fix after r138348.
+
+ * platform/network/cf/SocketStreamHandleCFNet.cpp:
+ (WebCore::SocketStreamHandle::createStreams):
+
2012-12-20 Alexey Proskuryakov <a...@apple.com>
Disable Nagle algorithm on WebSocket implementation for CF.
Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (138351 => 138352)
--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2012-12-21 07:25:01 UTC (rev 138351)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2012-12-21 07:40:23 UTC (rev 138352)
@@ -53,7 +53,7 @@
#include "WebCoreSystemInterface.h"
#endif
-#if !PLATFORM(WIN) && !BUILDING_ON_LION
+#if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
extern "C" const CFStringRef _kCFStreamSocketSetNoDelay;
#endif
@@ -278,7 +278,7 @@
CFReadStreamRef readStream = 0;
CFWriteStreamRef writeStream = 0;
CFStreamCreatePairWithSocketToHost(0, host.get(), port(), &readStream, &writeStream);
-#if !PLATFORM(WIN) && !BUILDING_ON_LION
+#if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
// <rdar://problem/12855587> _kCFStreamSocketSetNoDelay is not exported on Windows
CFWriteStreamSetProperty(writeStream, _kCFStreamSocketSetNoDelay, kCFBooleanTrue);
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
