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

[gnunet]

Author: Karlson2k
Date: 2016-09-14 19:37:35 +0200 (Wed, 14 Sep 2016)
New Revision: 37920

Modified:
   libmicrohttpd/src/microhttpd/connection.c
Log:
HTTP Upgrade: adjusted socket buffering for Upgrade

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2016-09-14 17:37:32 UTC (rev 
37919)
+++ libmicrohttpd/src/microhttpd/connection.c   2016-09-14 17:37:35 UTC (rev 
37920)
@@ -2876,14 +2876,11 @@
         case MHD_CONNECTION_HEADERS_SENT:
           /* Some clients may take some actions right after header receive */
           if (MHD_NO != socket_flush_possible (connection))
-            {
-              socket_start_no_buffering_flush (connection);
-              socket_start_extra_buffering (connection);
-            }
-          else
-            socket_start_normal_buffering (connection);
+            socket_start_no_buffering_flush (connection);
+
           if (NULL != connection->response->upgrade_handler)
             {
+              socket_start_normal_buffering (connection);
               /* This connection is "upgraded".  Pass socket to application. */
               if (MHD_YES !=
                   MHD_response_execute_upgrade_ (connection->response,
@@ -2897,6 +2894,10 @@
               connection->state = MHD_CONNECTION_UPGRADE;
               continue;
             }
+          if (MHD_NO != socket_flush_possible (connection))
+            socket_start_extra_buffering (connection);
+          else
+            socket_start_normal_buffering (connection);
 
           if (connection->have_chunked_upload)
             connection->state = MHD_CONNECTION_CHUNKED_BODY_UNREADY;