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.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 304c8e64..78d7d5df 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1293,14 +1293,14 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
1293 1293
1294#ifdef MHD_USE_THREADS 1294#ifdef MHD_USE_THREADS
1295 mhd_assert ( (! MHD_D_IS_USING_THREADS_ (daemon)) || \ 1295 mhd_assert ( (! MHD_D_IS_USING_THREADS_ (daemon)) || \
1296 (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || \ 1296 MHD_D_IS_USING_THREAD_PER_CONN_ (daemon) || \
1297 MHD_thread_handle_ID_is_current_thread_ (daemon->tid) ); 1297 MHD_thread_handle_ID_is_current_thread_ (daemon->tid) );
1298#endif /* MHD_USE_THREADS */ 1298#endif /* MHD_USE_THREADS */
1299 1299
1300 if (0 == (daemon->options & MHD_USE_TLS)) 1300 if (0 == (daemon->options & MHD_USE_TLS))
1301 return; /* Nothing to do with non-TLS connection. */ 1301 return; /* Nothing to do with non-TLS connection. */
1302 1302
1303 if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) 1303 if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
1304 DLL_remove (daemon->urh_head, 1304 DLL_remove (daemon->urh_head,
1305 daemon->urh_tail, 1305 daemon->urh_tail,
1306 urh); 1306 urh);
@@ -6351,7 +6351,7 @@ MHD_update_last_activity_ (struct MHD_Connection *connection)
6351 return; /* no activity on suspended connections */ 6351 return; /* no activity on suspended connections */
6352 6352
6353 connection->last_activity = MHD_monotonic_msec_counter (); 6353 connection->last_activity = MHD_monotonic_msec_counter ();
6354 if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) 6354 if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
6355 return; /* each connection has personal timeout */ 6355 return; /* each connection has personal timeout */
6356 6356
6357 if (connection->connection_timeout_ms != daemon->connection_timeout_ms) 6357 if (connection->connection_timeout_ms != daemon->connection_timeout_ms)
@@ -6973,7 +6973,7 @@ cleanup_connection (struct MHD_Connection *connection)
6973 } 6973 }
6974 else 6974 else
6975 { 6975 {
6976 if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) 6976 if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
6977 { 6977 {
6978 if (connection->connection_timeout_ms == daemon->connection_timeout_ms) 6978 if (connection->connection_timeout_ms == daemon->connection_timeout_ms)
6979 XDLL_remove (daemon->normal_timeout_head, 6979 XDLL_remove (daemon->normal_timeout_head,
@@ -6996,7 +6996,7 @@ cleanup_connection (struct MHD_Connection *connection)
6996#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) 6996#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
6997 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); 6997 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
6998#endif 6998#endif
6999 if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) 6999 if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
7000 { 7000 {
7001 /* if we were at the connection limit before and are in 7001 /* if we were at the connection limit before and are in
7002 thread-per-connection mode, signal the main thread 7002 thread-per-connection mode, signal the main thread
@@ -7738,7 +7738,7 @@ MHD_set_connection_option (struct MHD_Connection *connection,
7738 ui_val = UINT64_MAX / 4000 - 1; 7738 ui_val = UINT64_MAX / 4000 - 1;
7739 } 7739 }
7740#endif /* (SIZEOF_UINT64_T - 2) <= SIZEOF_UNSIGNED_INT */ 7740#endif /* (SIZEOF_UINT64_T - 2) <= SIZEOF_UNSIGNED_INT */
7741 if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) 7741 if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
7742 { 7742 {
7743#if defined(MHD_USE_THREADS) 7743#if defined(MHD_USE_THREADS)
7744 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex); 7744 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);