[GNUnet-SVN] [libmicrohttpd] 92/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 20c16b79274adc3fa3a5ce0d8f53aeb83ad001db
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Jul 25 20:12:49 2019 +0200

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

diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index d680f55b..c6a1dec5 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -397,8 +397,6 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
 #ifdef HTTPS_SUPPORT
   using_tls = (0 != (connection->daemon->options & MHD_USE_TLS));
 #endif
-  if (! (have_more || using_tls))
-    pre_cork_setsockopt (connection, want_cork);
 
 #ifdef HTTPS_SUPPORT
   if (using_tls)
@@ -444,6 +442,8 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
 #endif
   {
     /* plaintext transmission */
+    if (! have_more)
+      pre_cork_setsockopt (connection, want_cork);
 #if MSG_MORE
     ret = send (s,
                 buffer,
@@ -476,10 +476,10 @@ MHD_send_on_connection_ (struct MHD_Connection 
*connection,
     else if (buffer_size > (size_t) ret)
       connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY;
 #endif /* EPOLL_SUPPORT */
+    if (! have_more)
+      post_cork_setsockopt (connection, want_cork);
   }
 
-  if (! (have_more || using_tls))
-    post_cork_setsockopt (connection, want_cork);
   return ret;
 }
 

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