[libmicrohttpd] branch master updated (78a167d8 -> a55b52f0)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 78a167d8 ChangeLog updated
     new 85b9c083 Corrected typos in ChangeLog
     new 387ec260 Fixed copy-paster and typo errors
     new 79df0730 upgraded connection: ensure normal buffering
     new a55b52f0 test_upgrade{,_large}: removed use on unportable function

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ChangeLog                           | 10 ++++++++--
 src/microhttpd/daemon.c             |  2 +-
 src/microhttpd/mhd_send.c           |  2 +-
 src/microhttpd/response.c           |  2 ++
 src/microhttpd/test_upgrade.c       |  2 --
 src/microhttpd/test_upgrade_large.c |  4 ----
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c9ea9f5b..dcafa01d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu 22 Apr 2021 12:32:00 MSK
+    Fixed some typos.
+    Force disable TCP_CORK, TCP_NOPUSH, and TCP_NODELAY before switching
+    connection to "upgraded" mode.
+    Improved portability of the test-suite for upgraded connections. -EG
+
 Tue 20 Apr 2021 17:11:00 MSK
     Disabled NLS by default in configure. -EG
 
@@ -34,8 +40,8 @@ Fri 16 Apr 2021 10:23:39 AM CEST
     syscalls). -CG
 
 Thu 15 Apr 2021 18:56:00 MSK
-    Fixed configure '--enable-sanitizer' paramenter.
-    Stopped pushing of patrial responses when limited by system maximum size
+    Fixed configure '--enable-sanitizer' parameter.
+    Stopped pushing of partial responses when limited by system maximum size
     for sendmsg(). -EG
 
 Web 14 Apr 2021 22:20:00 MSK
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 1a4d7452..ad3bd7a7 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5863,7 +5863,7 @@ parse_options_va (struct MHD_Daemon *daemon,
                                &af,
                                &len))
           {
-            daemon->listen_is_unix = (AF_UNIX == af) ? _MHD_YES : MHD_NO;
+            daemon->listen_is_unix = (AF_UNIX == af) ? _MHD_YES : _MHD_NO;
           }
           else
             daemon->listen_is_unix = _MHD_UNKNOWN;
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index a9f2b484..a69fbd07 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -157,7 +157,7 @@ MHD_send_init_static_vars_ (void)
    * and handles SF_NODISKIO differently.
    * SF_FLAGS defined only on FreeBSD 11 and later. */
 #ifdef SF_FLAGS
-  freebsd_sendfile_init_ (void);
+  freebsd_sendfile_init_ ();
 #endif /* SF_FLAGS */
 #endif /* HAVE_FREEBSD_SENDFILE */
 #if defined(HAVE_SYSCONF) && defined(_SC_IOV_MAX)
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index ab8a56e8..8c047077 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -1104,6 +1104,8 @@ MHD_response_execute_upgrade_ (struct MHD_Response 
*response,
   urh->connection = connection;
   rbo = connection->read_buffer_offset;
   connection->read_buffer_offset = 0;
+  MHD_connection_set_nodelay_state_ (connection, false);
+  MHD_connection_set_cork_state_ (connection, false);
 #ifdef HTTPS_SUPPORT
   if (0 != (daemon->options & MHD_USE_TLS) )
   {
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 8a76ec5e..c5eb43c8 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -694,8 +694,6 @@ run_usock (void *cls)
 {
   struct MHD_UpgradeResponseHandle *urh = cls;
 
-  MHD_upgrade_action (urh,
-                      MHD_UPGRADE_ACTION_CORK_OFF);
   send_all (usock,
             "Hello");
   recv_all (usock,
diff --git a/src/microhttpd/test_upgrade_large.c 
b/src/microhttpd/test_upgrade_large.c
index aeae5127..de0626c8 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -881,10 +881,6 @@ run_usock (void *cls)
 {
   struct MHD_UpgradeResponseHandle *urh = cls;
 
-  if (MHD_YES !=
-      MHD_upgrade_action (urh,
-                          MHD_UPGRADE_ACTION_CORK_OFF))
-    abort ();
   send_all (usock,
             LARGE_STRING);
   recv_all (usock,

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