[GNUnet-SVN] [libmicrohttpd] branch master updated: MHD_suspend_connection(): prevent suspending of connections scheduled for HTTP "Upgrade"

[gnunet]

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

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new 7d305032 MHD_suspend_connection(): prevent suspending of connections 
scheduled for HTTP "Upgrade"
7d305032 is described below

commit 7d3050325e3b77a061b40ea9ce77a360d14b4dea
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun May 21 16:11:25 2017 +0300

    MHD_suspend_connection(): prevent suspending of connections scheduled for 
HTTP "Upgrade"
---
 src/microhttpd/daemon.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 9bed84bc..afbbc965 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2737,6 +2737,16 @@ MHD_suspend_connection (struct MHD_Connection 
*connection)
   if (0 == (daemon->options & MHD_TEST_ALLOW_SUSPEND_RESUME))
     MHD_PANIC (_("Cannot suspend connections without enabling 
MHD_ALLOW_SUSPEND_RESUME!\n"));
   MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
+#ifdef UPGRADE_SUPPORT
+  if (NULL != connection->urh)
+    {
+#ifdef HAVE_MESSAGES
+      MHD_DLOG (daemon,
+                _("Error: connection sheduled for \"upgrade\" cannot be 
suspended"));
+#endif /* HAVE_MESSAGES */
+      return;
+    }
+#endif /* UPGRADE_SUPPORT */
   if (connection->resuming)
     {
       /* suspending again while we didn't even complete resuming yet */

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