[GNUnet-SVN] r38065 - libmicrohttpd/src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2016-10-03 23:13:38 +0200 (Mon, 03 Oct 2016)
New Revision: 38065

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
Log:
Fix using select()/poll() loop when MHD compiled with HTTPS, but upgraded 
connection is HTTP

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2016-10-03 21:13:35 UTC (rev 
38064)
+++ libmicrohttpd/src/microhttpd/daemon.c       2016-10-03 21:13:38 UTC (rev 
38065)
@@ -1133,7 +1133,8 @@
   /* Here, we need to bi-directionally forward
      until the application tells us that it is done
      with the socket; */
-  if (0 == (daemon->options & MHD_USE_POLL))
+  if ( (0 != (daemon->options & MHD_USE_SSL)) &&
+      (0 == (daemon->options & MHD_USE_POLL)))
     {
       while (MHD_CONNECTION_UPGRADE == con->state)
         {
@@ -1192,7 +1193,7 @@
         }
     }
 #ifdef HAVE_POLL
-  else
+  else if (0 != (daemon->options & MHD_USE_SSL))
     {
       /* use poll() */
       const unsigned int timeout = UINT_MAX;