aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/connection.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/microhttpd/connection.c')
-rw-r--r--src/microhttpd/connection.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 35dd96ab..b1872517 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1151,7 +1151,7 @@ MHD_connection_close_ (struct MHD_Connection *connection,
1151 mhd_assert (! connection->suspended); 1151 mhd_assert (! connection->suspended);
1152#ifdef MHD_USE_THREADS 1152#ifdef MHD_USE_THREADS
1153 mhd_assert ( (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || \ 1153 mhd_assert ( (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || \
1154 MHD_thread_ID_is_current_thread_ (connection->tid) ); 1154 MHD_thread_handle_ID_is_current_thread_ (connection->tid) );
1155#endif /* MHD_USE_THREADS */ 1155#endif /* MHD_USE_THREADS */
1156 if ( (NULL != daemon->notify_completed) && 1156 if ( (NULL != daemon->notify_completed) &&
1157 (connection->rq.client_aware) ) 1157 (connection->rq.client_aware) )
@@ -1195,7 +1195,7 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
1195#ifdef MHD_USE_THREADS 1195#ifdef MHD_USE_THREADS
1196 mhd_assert ( (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || \ 1196 mhd_assert ( (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || \
1197 (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || \ 1197 (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || \
1198 MHD_thread_ID_is_current_thread_ (daemon->tid) ); 1198 MHD_thread_handle_ID_is_current_thread_ (daemon->tid) );
1199#endif /* MHD_USE_THREADS */ 1199#endif /* MHD_USE_THREADS */
1200 1200
1201 if (0 == (daemon->options & MHD_USE_TLS)) 1201 if (0 == (daemon->options & MHD_USE_TLS))
@@ -6249,7 +6249,7 @@ cleanup_connection (struct MHD_Connection *connection)
6249 struct MHD_Daemon *daemon = connection->daemon; 6249 struct MHD_Daemon *daemon = connection->daemon;
6250#ifdef MHD_USE_THREADS 6250#ifdef MHD_USE_THREADS
6251 mhd_assert ( (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || \ 6251 mhd_assert ( (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || \
6252 MHD_thread_ID_is_current_thread_ (connection->tid) ); 6252 MHD_thread_handle_ID_is_current_thread_ (connection->tid) );
6253 mhd_assert (NULL == daemon->worker_pool); 6253 mhd_assert (NULL == daemon->worker_pool);
6254#endif /* MHD_USE_THREADS */ 6254#endif /* MHD_USE_THREADS */
6255 6255
@@ -6456,7 +6456,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
6456 enum MHD_Result ret; 6456 enum MHD_Result ret;
6457#ifdef MHD_USE_THREADS 6457#ifdef MHD_USE_THREADS
6458 mhd_assert ( (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || \ 6458 mhd_assert ( (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || \
6459 MHD_thread_ID_is_current_thread_ (connection->tid) ); 6459 MHD_thread_handle_ID_is_current_thread_ (connection->tid) );
6460#endif /* MHD_USE_THREADS */ 6460#endif /* MHD_USE_THREADS */
6461 /* 'daemon' is not used if epoll is not available and asserts are disabled */ 6461 /* 'daemon' is not used if epoll is not available and asserts are disabled */
6462 (void) daemon; /* Mute compiler warning */ 6462 (void) daemon; /* Mute compiler warning */
@@ -7140,7 +7140,7 @@ MHD_queue_response (struct MHD_Connection *connection,
7140#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) 7140#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
7141 if ( (! connection->suspended) && 7141 if ( (! connection->suspended) &&
7142 (0 != (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) && 7142 (0 != (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) &&
7143 (! MHD_thread_ID_is_current_thread_ (connection->tid)) ) 7143 (! MHD_thread_handle_ID_is_current_thread_ (connection->tid)) )
7144 { 7144 {
7145#ifdef HAVE_MESSAGES 7145#ifdef HAVE_MESSAGES
7146 MHD_DLOG (daemon, 7146 MHD_DLOG (daemon,