Use TCP_NOPUSH on OS X and FreeBSD

tn2-solutions · Jan 8, 2017 · 9f9ae85 · 9f9ae85
1 parent bf78cf7
commit 9f9ae85
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Socket.h b/src/Socket.h
@@ -108,10 +108,16 @@ class WIN32_EXPORT Socket {
     Address getAddress();
 
     void cork(int enable) {
+#if defined(TCP_CORK)
         // Linux & SmartOS have proper TCP_CORK
-        // Mac OS X & FreeBSD have TCP_NOPUSH which is useless
-#ifdef TCP_CORK
         setsockopt(getFd(), IPPROTO_TCP, TCP_CORK, &enable, sizeof(int));
+#elif defined(TCP_NOPUSH)
+        // Mac OS X & FreeBSD have TCP_NOPUSH
+        setsockopt(getFd(), IPPROTO_TCP, TCP_NOPUSH, &enable, sizeof(int));
+        if (!enable) {
+            // Tested on OS X, FreeBSD situation is unclear
+            ::send(getFd(), "", 0, MSG_NOSIGNAL);
+        }
 #endif
     }