[GNUnet-SVN] [libmicrohttpd] 131/154: toggle Naggle if and only if corking is not possible by other means

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository libmicrohttpd.

commit 4b62caead6edb2d4b75ef1c99e653d4b30ac9007
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Aug 1 20:50:35 2019 +0200

    toggle Naggle if and only if corking is not possible by other means
---
 src/microhttpd/mhd_send.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index 9b07115c..5fed8767 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -90,6 +90,19 @@ pre_cork_setsockopt (struct MHD_Connection *connection,
       /* any others? man page does not list more... */
       break;
     }
+#else
+  /* CORK/NOPUSH/MSG_MORE do not exist on this platform,
+     so we must toggle Naggle's algorithm on/off instead
+     (otherwise we keep it always off) */
+  if (connection->sk_cork_on == want_cork)
+    {
+      /* nothing to do, success! */
+      return;
+    }
+  if ( (want_cork) &&
+       (0 == MHD_socket_set_nodelay (connection->socket_fd,
+                                     false)) )
+    connection->sk_cork_on = true;
 #endif
 }
 
@@ -148,6 +161,19 @@ post_cork_setsockopt (struct MHD_Connection *connection,
       /* any others? man page does not list more... */
       break;
     }
+#else
+  /* CORK/NOPUSH/MSG_MORE do not exist on this platform,
+     so we must toggle Naggle's algorithm on/off instead
+     (otherwise we keep it always off) */
+  if (connection->sk_cork_on == want_cork)
+    {
+      /* nothing to do, success! */
+      return;
+    }
+  if ( (! want_cork) &&
+       (0 == MHD_socket_set_nodelay (connection->socket_fd,
+                                     true)) )
+    connection->sk_cork_on = false;
 #endif
 }
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.