commit 0ecf4f26e4c1a4c03d66e1d04bf4cae62bd236a0
parent a7b6407cc25d864cb5ce997d6dc693b6d0d2b223
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Sun, 21 May 2017 18:47:15 +0300
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.
Diffstat:
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/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
diff --git a/src/microhttpd/daemon.c b/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