Sfoglia il codice sorgente

resume_suspended_connections(): do not update connection state during resuming,
handle update of states in main loop as handling of locking can significantly increase
complexity of processing in resume_suspended_connections().
This revert 16da279752e54c616edcb485ea637234101447c9, but resumed connections in epoll
mode are processed already faster after 534d586422c6eba94ae1b193338138cb2abce3cf.

Evgeny Grin (Karlson2k) 8 anni fa
parent
commit
0ecf4f26e4
2 ha cambiato i file con 10 aggiunte e 3 eliminazioni
  1. 10 0
      ChangeLog
  2. 0 3
      src/microhttpd/daemon.c

+ 10 - 0
ChangeLog

@@ -1,3 +1,13 @@
+Sun May 21 18:48:00 MSK 2017
+	Fixed build with disabled "UPGRADE".
+	Fixed possible null-dereference in HTTPS test.
+	Fixed compiler warning in process_request_body(), minor optimizations.
+	Do not allow suspend of "upgraded" connections.
+	Fixed returned value for MHD_CONNECTION_INFO_CONNECTION_SUSPENDED.
+	Fixed removal from timeout lists of non-existing connections in
+	cleanup_connection().
+	Fixed double locking of mutex. -EG
+
 Sun May 14 15:05:00 MSK 2017
 	Fixed resuming connections and closing upgraded connections in select()
 	mode with thread-per-connection. -EG

+ 0 - 3
src/microhttpd/daemon.c

@@ -2914,9 +2914,6 @@ resume_suspended_connections (struct MHD_Daemon *daemon)
               pos->epoll_state &= ~MHD_EPOLL_STATE_SUSPENDED;
             }
 #endif
-          /* Process response queued during suspend and update states. */
-          if (!used_thr_p_c)
-            MHD_connection_handle_idle (pos);
         }
 #ifdef UPGRADE_SUPPORT
       else