[GNUnet-SVN] [libmicrohttpd] 97/154: simplify

[gnunet]

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

ng0 pushed a commit to branch master
in repository libmicrohttpd.

commit be5ba4767f4e64099f673f24cace9d6817651356
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Jul 25 20:24:53 2019 +0200

    simplify
---
 src/microhttpd/mhd_send.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index 656a4b5c..fa128fa1 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -61,11 +61,7 @@ post_cork_setsockopt (struct MHD_Connection *connection,
                       &off_val,
                       sizeof (off_val));
 #elif TCP_NODELAY
-  ret = setsockopt (connection->socket_fd,
-                    IPPROTO_TCP,
-                    TCP_NODELAY,
-                    (const void *) &off_val,
-                    sizeof (off_val));
+  /* nothing to do */
 #elif TCP_NOPUSH
   ret = setsockopt (connection->socket_fd,
                     IPPROTO_TCP,
@@ -108,7 +104,7 @@ pre_cork_setsockopt (struct MHD_Connection *connection,
   ret = setsockopt (connection->socket_fd,
                     IPPROTO_TCP,
                     TCP_NODELAY,
-                    (const void *) &on_val,
+                    (const void *) want_cork ? &off_val : &on_val,
                     sizeof (on_val));
 #elif TCP_NOPUSH
   ret = setsockopt (connection->socket_fd,

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