diff options
Diffstat (limited to 'src/lib/connection_call_handlers.c')
-rw-r--r-- | src/lib/connection_call_handlers.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/connection_call_handlers.c b/src/lib/connection_call_handlers.c index 92b0e8f7..af8860d6 100644 --- a/src/lib/connection_call_handlers.c +++ b/src/lib/connection_call_handlers.c | |||
@@ -379,7 +379,7 @@ sendfile_adapter (struct MHD_Connection *connection) | |||
379 | #ifdef HAVE_DARWIN_SENDFILE | 379 | #ifdef HAVE_DARWIN_SENDFILE |
380 | off_t len; | 380 | off_t len; |
381 | #endif /* HAVE_DARWIN_SENDFILE */ | 381 | #endif /* HAVE_DARWIN_SENDFILE */ |
382 | const bool used_thr_p_c = (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model); | 382 | const bool used_thr_p_c = (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode); |
383 | const size_t chunk_size = used_thr_p_c ? MHD_SENFILE_CHUNK_THR_P_C_ : MHD_SENFILE_CHUNK_; | 383 | const size_t chunk_size = used_thr_p_c ? MHD_SENFILE_CHUNK_THR_P_C_ : MHD_SENFILE_CHUNK_; |
384 | size_t send_size = 0; | 384 | size_t send_size = 0; |
385 | 385 | ||
@@ -2754,7 +2754,7 @@ process_request_body (struct MHD_Request *request) | |||
2754 | /* client did not process all upload data, complain if | 2754 | /* client did not process all upload data, complain if |
2755 | the setup was incorrect, which may prevent us from | 2755 | the setup was incorrect, which may prevent us from |
2756 | handling the rest of the request */ | 2756 | handling the rest of the request */ |
2757 | if ( (MHD_TM_EXTERNAL_EVENT_LOOP == daemon->threading_model) && | 2757 | if ( (MHD_TM_EXTERNAL_EVENT_LOOP == daemon->threading_mode) && |
2758 | (! connection->suspended) ) | 2758 | (! connection->suspended) ) |
2759 | MHD_DLOG (daemon, | 2759 | MHD_DLOG (daemon, |
2760 | MHD_SC_APPLICATION_HUNG_CONNECTION, | 2760 | MHD_SC_APPLICATION_HUNG_CONNECTION, |
@@ -2810,7 +2810,7 @@ cleanup_connection (struct MHD_Connection *connection) | |||
2810 | } | 2810 | } |
2811 | else | 2811 | else |
2812 | { | 2812 | { |
2813 | if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) | 2813 | if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) |
2814 | { | 2814 | { |
2815 | if (connection->connection_timeout == | 2815 | if (connection->connection_timeout == |
2816 | daemon->connection_default_timeout) | 2816 | daemon->connection_default_timeout) |
@@ -2832,7 +2832,7 @@ cleanup_connection (struct MHD_Connection *connection) | |||
2832 | connection->resuming = false; | 2832 | connection->resuming = false; |
2833 | connection->request.in_idle = false; | 2833 | connection->request.in_idle = false; |
2834 | MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); | 2834 | MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); |
2835 | if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model) | 2835 | if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode) |
2836 | { | 2836 | { |
2837 | /* if we were at the connection limit before and are in | 2837 | /* if we were at the connection limit before and are in |
2838 | thread-per-connection mode, signal the main thread | 2838 | thread-per-connection mode, signal the main thread |
@@ -2973,7 +2973,7 @@ connection_update_event_loop_info (struct MHD_Connection *connection) | |||
2973 | if (request->read_buffer_offset == request->read_buffer_size) | 2973 | if (request->read_buffer_offset == request->read_buffer_size) |
2974 | { | 2974 | { |
2975 | if ( (! try_grow_read_buffer (request)) && | 2975 | if ( (! try_grow_read_buffer (request)) && |
2976 | (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model) ) | 2976 | (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) ) |
2977 | { | 2977 | { |
2978 | /* failed to grow the read buffer, and the client | 2978 | /* failed to grow the read buffer, and the client |
2979 | which is supposed to handle the received data in | 2979 | which is supposed to handle the received data in |
@@ -3675,7 +3675,7 @@ MHD_connection_call_handlers_ (struct MHD_Connection *con, | |||
3675 | * TLS read-ready connection in 'read info' state as connection | 3675 | * TLS read-ready connection in 'read info' state as connection |
3676 | * without space in read buffer will be market as 'info block'. */ | 3676 | * without space in read buffer will be market as 'info block'. */ |
3677 | if ( (! daemon->data_already_pending) && | 3677 | if ( (! daemon->data_already_pending) && |
3678 | (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) ) | 3678 | (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) ) |
3679 | { | 3679 | { |
3680 | if (MHD_EVENT_LOOP_INFO_BLOCK == | 3680 | if (MHD_EVENT_LOOP_INFO_BLOCK == |
3681 | con->request.event_loop_info) | 3681 | con->request.event_loop_info) |