[libmicrohttpd] 03/06: mhd_send: fixed compatibility with platforms without TCP_CORK and TCP_NOPUSH

[gnunet]

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

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

commit 8435c616da188dbb0608774503506fc70c579d5d
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Sun Nov 29 23:04:24 2020 +0300

    mhd_send: fixed compatibility with platforms without TCP_CORK and TCP_NOPUSH
    
    TCP_NODELAY must be turned of *before* send()
    otherwise it doesn't push buffered data.
---
 src/microhttpd/mhd_send.c | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index f55f70fa..4dedec14 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -186,18 +186,17 @@ pre_cork_setsockopt (struct MHD_Connection *connection,
     break;
   }
 #else
-  /* CORK/NOPUSH/MSG_MORE do not exist on this platform,
-     so we must toggle Naggle's algorithm on/off instead
+  /* CORK/NOPUSH do not exist on this platform,
+     Turning on/off of Naggle's algorithm
      (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;
+  if (0 == MHD_socket_set_nodelay_ (connection->socket_fd,
+                                    (! want_cork)))
+    connection->sk_cork_on = want_cork;
 #endif
 }
 
@@ -284,18 +283,6 @@ post_cork_setsockopt (struct MHD_Connection *connection,
     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
gnunet@gnunet.org.