[libmicrohttpd] branch master updated: Fix #6610 as suggested by AP

[gnunet]

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

grothoff pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new 567aa11a Fix #6610 as suggested by AP
567aa11a is described below

commit 567aa11a97f0562842f10e2763fb4804166a0cb2
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Oct 21 10:01:52 2020 +0200

    Fix #6610 as suggested by AP
---
 ChangeLog                   |  5 ++++-
 src/microhttpd/connection.c | 23 ++++++++---------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e85001c..e8aeed86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Wed 21 Oct 2020 10:00:58 AM CEST
+    Corking should be OFF when sending the footer (#6610). -AP/CG
+
 Wed 07 Oct 2020 11:07:00 MSK
     W32 default target version changed to Vista, XP is still supported.
     Minor fixes and additional asserts for memorypool.
@@ -17,7 +20,7 @@ Thu 24 Sep 2020 16:55:00 MSK
     Fixed compiler warnings on W32.
     Minor optimisation of MHD_YES/MHD_NO internal usage.
     Refactor and cleanup of internal debugging macros.
-    Updated HTTP status codes, header names and methods from 
+    Updated HTTP status codes, header names and methods from
     the registries.
     Fixed portability of test_upgrade_large.
     Minor testsuite fixes.
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 98e58123..94ed459d 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -615,8 +615,7 @@ MHD_connection_mark_closed_ (struct MHD_Connection 
*connection)
      * and do not shutdown TCP socket. This give more
      * chances to send TLS closure data to remote side.
      * Closure of TLS layer will be interpreted by
-     * remote side as end of transmission. */
-    if (0 != (daemon->options & MHD_USE_TLS))
+     * remote side as end of transmission. */if (0 != (daemon->options & 
MHD_USE_TLS))
     {
       if (! MHD_tls_connection_shutdown (connection))
         shutdown (connection->socket_fd,
@@ -730,8 +729,7 @@ MHD_connection_finish_forward_ (struct MHD_Connection 
*connection)
    * used with MHD_UPGRADE_ACTION_CLOSE. They will be
    * closed by MHD_cleanup_upgraded_connection_() during
    * connection's final cleanup.
-   */
-}
+   */}
 
 
 #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT*/
@@ -1144,8 +1142,7 @@ try_grow_read_buffer (struct MHD_Connection *connection,
        the right position in the pool, say because someone called
        MHD_pool_allocate() without 'from_end' set to 'true'? Anyway,
        should be investigated! (Ideally provide all data from
-       *pool and connection->read_buffer and new_size for debugging). */
-    mhd_assert (0);
+       *pool and connection->read_buffer and new_size for debugging). 
*/mhd_assert (0);
     return false;
   }
   connection->read_buffer = rb;
@@ -1370,8 +1367,7 @@ build_header_response (struct MHD_Connection *connection)
 
         Note that the change from 'SHOULD NOT' to 'MUST NOT' is
         a recent development of the HTTP 1.1 specification.
-      */
-      content_length_len
+      */content_length_len
         = MHD_snprintf_ (content_length_buf,
                          sizeof (content_length_buf),
                          MHD_HTTP_HEADER_CONTENT_LENGTH ": "
@@ -1704,8 +1700,7 @@ MHD_connection_update_event_loop_info (struct 
MHD_Connection *connection)
              or if we do nothing, we would just timeout
              on the connection (if a timeout is even
              set!).
-             Solution: we kill the connection with an error */
-          transmit_error_response (connection,
+             Solution: we kill the connection with an error 
*/transmit_error_response (connection,
                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
                                    INTERNAL_ERROR);
           continue;
@@ -2479,8 +2474,7 @@ process_header_line (struct MHD_Connection *connection,
      header at the beginning of the while
      loop since we need to be able to inspect
      the *next* header line (in case it starts
-     with a space...) */
-  connection->last = line;
+     with a space...) */connection->last = line;
   connection->colon = colon;
   return MHD_YES;
 }
@@ -2527,8 +2521,7 @@ process_broken_line (struct MHD_Connection *connection,
  adjacency); also, in the case where these are not adjacent
  (not sure how it can happen!), we would want to allocate from
  the end of the pool, so as to not destroy the read-buffer's
- ability to grow nicely. */
-    last = MHD_pool_reallocate (connection->pool,
+ ability to grow nicely. */last = MHD_pool_reallocate (connection->pool,
                                 last,
                                 last_len + 1,
                                 last_len + tmp_len + 1);
@@ -3078,7 +3071,7 @@ MHD_connection_handle_write (struct MHD_Connection 
*connection)
                                    [connection->write_buffer_send_offset],
                                    connection->write_buffer_append_offset
                                    - connection->write_buffer_send_offset,
-                                   MHD_SSO_HDR_CORK);
+                                   MHD_SSO_NO_CORK);
     if (ret < 0)
     {
       if (MHD_ERR_AGAIN_ == ret)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.