[GNUnet-SVN] [libmicrohttpd] branch master updated (917342b3 -> 787bfd18)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 917342b3 Do not add "Connection: Keep-Alive" header for "upgrade" 
connections
     new 3cc303b7 Resume resuming connection before other processing in 
external polling mode
     new 787bfd18 Do not add any "Connection" headers for "upgrade" connections.

The 2 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                   | 7 +++++++
 src/include/microhttpd.h    | 2 +-
 src/microhttpd/connection.c | 3 +++
 src/microhttpd/daemon.c     | 7 ++++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d60111b..4e87285a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu May 11 14:24:00 MSK 2017
+       Do not add any "Connection" headers for "upgrade" connections. -EG
+
+Wed May 10 23:09:00 MSK 2017
+       Resume resuming connection before other processing in external polling 
+       mode. -EG
+
 Tue May  9 23:16:00 MSK 2017
        Fixed: Do not add "Connection: Keep-Alive" header for "upgrade"
        connections. -EG
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index a026b565..58787d3a 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -126,7 +126,7 @@ typedef intptr_t ssize_t;
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00095400
+#define MHD_VERSION 0x00095401
 
 /**
  * MHD-internal return code for "YES".
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index a987a97b..803eccba 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1205,6 +1205,9 @@ build_header_response (struct MHD_Connection *connection)
              (connection->read_closed) ||
              (MHD_CONN_MUST_CLOSE == connection->keepalive)) &&
            (! response_has_close) &&
+#ifdef UPGRADE_SUPPORT
+           (NULL == connection->response->upgrade_handler) &&
+#endif /* UPGRADE_SUPPORT */
            (0 == (connection->response->flags & MHD_RF_HTTP_VERSION_1_0_ONLY) 
) )
         must_add_close = MHD_YES;
 
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index a91d2687..526773e1 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3477,7 +3477,8 @@ MHD_run_from_select (struct MHD_Daemon *daemon,
     }
 
   /* Resuming external connections when using an extern mainloop  */
-  resume_suspended_connections (daemon);
+  if (0 != (daemon->options & MHD_ALLOW_SUSPEND_RESUME))
+    resume_suspended_connections (daemon);
 
   return internal_run_from_select (daemon, read_fd_set,
                                    write_fd_set, except_fd_set);
@@ -4460,6 +4461,10 @@ MHD_run (struct MHD_Daemon *daemon)
   if ( (daemon->shutdown) ||
        (0 != (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) )
     return MHD_NO;
+  /* Resume resuming connection (if any) so they will be processing
+   * in this turn. */
+  if (0 != (daemon->options & MHD_ALLOW_SUSPEND_RESUME))
+    resume_suspended_connections (daemon);
   if (0 != (daemon->options & MHD_USE_POLL))
   {
     MHD_poll (daemon, MHD_NO);

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