diff options
Diffstat (limited to 'src/microhttpd/connection.c')
-rw-r--r-- | src/microhttpd/connection.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c index af5fac78..cfa4a806 100644 --- a/src/microhttpd/connection.c +++ b/src/microhttpd/connection.c | |||
@@ -1135,7 +1135,7 @@ build_header_response (struct MHD_Connection *connection) | |||
1135 | 1135 | ||
1136 | /* check for other reasons to add 'close' header */ | 1136 | /* check for other reasons to add 'close' header */ |
1137 | if ( ( (NULL != client_requested_close) || | 1137 | if ( ( (NULL != client_requested_close) || |
1138 | (MHD_YES == connection->read_closed) ) && | 1138 | (connection->read_closed) ) && |
1139 | (NULL == response_has_close) && | 1139 | (NULL == response_has_close) && |
1140 | (0 == (connection->response->flags & MHD_RF_HTTP_VERSION_1_0_ONLY) ) ) | 1140 | (0 == (connection->response->flags & MHD_RF_HTTP_VERSION_1_0_ONLY) ) ) |
1141 | must_add_close = MHD_YES; | 1141 | must_add_close = MHD_YES; |
@@ -1318,7 +1318,7 @@ transmit_error_response (struct MHD_Connection *connection, | |||
1318 | connection->version = MHD_HTTP_VERSION_1_0; | 1318 | connection->version = MHD_HTTP_VERSION_1_0; |
1319 | } | 1319 | } |
1320 | connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; | 1320 | connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; |
1321 | connection->read_closed = MHD_YES; | 1321 | connection->read_closed = true; |
1322 | #ifdef HAVE_MESSAGES | 1322 | #ifdef HAVE_MESSAGES |
1323 | MHD_DLOG (connection->daemon, | 1323 | MHD_DLOG (connection->daemon, |
1324 | _("Error processing request (HTTP response code is %u (`%s')). Closing connection.\n"), | 1324 | _("Error processing request (HTTP response code is %u (`%s')). Closing connection.\n"), |
@@ -1391,7 +1391,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection) | |||
1391 | REQUEST_TOO_BIG); | 1391 | REQUEST_TOO_BIG); |
1392 | continue; | 1392 | continue; |
1393 | } | 1393 | } |
1394 | if (MHD_NO == connection->read_closed) | 1394 | if (! connection->read_closed) |
1395 | connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; | 1395 | connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; |
1396 | else | 1396 | else |
1397 | connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; | 1397 | connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; |
@@ -1431,7 +1431,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection) | |||
1431 | } | 1431 | } |
1432 | } | 1432 | } |
1433 | if ( (connection->read_buffer_offset < connection->read_buffer_size) && | 1433 | if ( (connection->read_buffer_offset < connection->read_buffer_size) && |
1434 | (MHD_NO == connection->read_closed) ) | 1434 | (! connection->read_closed) ) |
1435 | connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; | 1435 | connection->event_loop_info = MHD_EVENT_LOOP_INFO_READ; |
1436 | else | 1436 | else |
1437 | connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; | 1437 | connection->event_loop_info = MHD_EVENT_LOOP_INFO_BLOCK; |
@@ -1440,7 +1440,7 @@ MHD_connection_update_event_loop_info (struct MHD_Connection *connection) | |||
1440 | case MHD_CONNECTION_FOOTER_PART_RECEIVED: | 1440 | case MHD_CONNECTION_FOOTER_PART_RECEIVED: |
1441 | /* while reading footers, we always grow the | 1441 | /* while reading footers, we always grow the |
1442 | read buffer if needed, no size-check required */ | 1442 | read buffer if needed, no size-check required */ |
1443 | if (MHD_YES == connection->read_closed) | 1443 | if (connection->read_closed) |
1444 | { | 1444 | { |
1445 | CONNECTION_CLOSE_ERROR (connection, | 1445 | CONNECTION_CLOSE_ERROR (connection, |
1446 | NULL); | 1446 | NULL); |
@@ -2073,7 +2073,7 @@ do_read (struct MHD_Connection *connection) | |||
2073 | { | 2073 | { |
2074 | /* other side closed connection; RFC 2616, section 8.1.4 suggests | 2074 | /* other side closed connection; RFC 2616, section 8.1.4 suggests |
2075 | we should then shutdown ourselves as well. */ | 2075 | we should then shutdown ourselves as well. */ |
2076 | connection->read_closed = MHD_YES; | 2076 | connection->read_closed = true; |
2077 | MHD_connection_close_ (connection, | 2077 | MHD_connection_close_ (connection, |
2078 | MHD_REQUEST_TERMINATED_CLIENT_ABORT); | 2078 | MHD_REQUEST_TERMINATED_CLIENT_ABORT); |
2079 | return MHD_YES; | 2079 | return MHD_YES; |
@@ -2309,7 +2309,7 @@ parse_connection_headers (struct MHD_Connection *connection) | |||
2309 | { | 2309 | { |
2310 | /* die, http 1.1 request without host and we are pedantic */ | 2310 | /* die, http 1.1 request without host and we are pedantic */ |
2311 | connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; | 2311 | connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; |
2312 | connection->read_closed = MHD_YES; | 2312 | connection->read_closed = true; |
2313 | #ifdef HAVE_MESSAGES | 2313 | #ifdef HAVE_MESSAGES |
2314 | MHD_DLOG (connection->daemon, | 2314 | MHD_DLOG (connection->daemon, |
2315 | _("Received HTTP 1.1 request without `Host' header.\n")); | 2315 | _("Received HTTP 1.1 request without `Host' header.\n")); |
@@ -2435,7 +2435,7 @@ MHD_connection_handle_read (struct MHD_Connection *connection) | |||
2435 | case MHD_CONNECTION_BODY_RECEIVED: | 2435 | case MHD_CONNECTION_BODY_RECEIVED: |
2436 | case MHD_CONNECTION_FOOTER_PART_RECEIVED: | 2436 | case MHD_CONNECTION_FOOTER_PART_RECEIVED: |
2437 | /* nothing to do but default action */ | 2437 | /* nothing to do but default action */ |
2438 | if (MHD_YES == connection->read_closed) | 2438 | if (connection->read_closed) |
2439 | { | 2439 | { |
2440 | MHD_connection_close_ (connection, | 2440 | MHD_connection_close_ (connection, |
2441 | MHD_REQUEST_TERMINATED_READ_ERROR); | 2441 | MHD_REQUEST_TERMINATED_READ_ERROR); |
@@ -2769,7 +2769,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
2769 | { | 2769 | { |
2770 | if (MHD_CONNECTION_INIT != connection->state) | 2770 | if (MHD_CONNECTION_INIT != connection->state) |
2771 | continue; | 2771 | continue; |
2772 | if (MHD_YES == connection->read_closed) | 2772 | if (connection->read_closed) |
2773 | { | 2773 | { |
2774 | CONNECTION_CLOSE_ERROR (connection, | 2774 | CONNECTION_CLOSE_ERROR (connection, |
2775 | NULL); | 2775 | NULL); |
@@ -2792,7 +2792,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
2792 | { | 2792 | { |
2793 | if (MHD_CONNECTION_URL_RECEIVED != connection->state) | 2793 | if (MHD_CONNECTION_URL_RECEIVED != connection->state) |
2794 | continue; | 2794 | continue; |
2795 | if (MHD_YES == connection->read_closed) | 2795 | if (connection->read_closed) |
2796 | { | 2796 | { |
2797 | CONNECTION_CLOSE_ERROR (connection, | 2797 | CONNECTION_CLOSE_ERROR (connection, |
2798 | NULL); | 2798 | NULL); |
@@ -2822,7 +2822,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
2822 | { | 2822 | { |
2823 | if (connection->state != MHD_CONNECTION_HEADER_PART_RECEIVED) | 2823 | if (connection->state != MHD_CONNECTION_HEADER_PART_RECEIVED) |
2824 | continue; | 2824 | continue; |
2825 | if (MHD_YES == connection->read_closed) | 2825 | if (connection->read_closed) |
2826 | { | 2826 | { |
2827 | CONNECTION_CLOSE_ERROR (connection, | 2827 | CONNECTION_CLOSE_ERROR (connection, |
2828 | NULL); | 2828 | NULL); |
@@ -2872,7 +2872,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
2872 | /* we refused (no upload allowed!) */ | 2872 | /* we refused (no upload allowed!) */ |
2873 | connection->remaining_upload_size = 0; | 2873 | connection->remaining_upload_size = 0; |
2874 | /* force close, in case client still tries to upload... */ | 2874 | /* force close, in case client still tries to upload... */ |
2875 | connection->read_closed = MHD_YES; | 2875 | connection->read_closed = true; |
2876 | } | 2876 | } |
2877 | connection->state = (0 == connection->remaining_upload_size) | 2877 | connection->state = (0 == connection->remaining_upload_size) |
2878 | ? MHD_CONNECTION_FOOTERS_RECEIVED : MHD_CONNECTION_CONTINUE_SENT; | 2878 | ? MHD_CONNECTION_FOOTERS_RECEIVED : MHD_CONNECTION_CONTINUE_SENT; |
@@ -2902,10 +2902,10 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
2902 | if ( (0 == connection->remaining_upload_size) || | 2902 | if ( (0 == connection->remaining_upload_size) || |
2903 | ( (MHD_SIZE_UNKNOWN == connection->remaining_upload_size) && | 2903 | ( (MHD_SIZE_UNKNOWN == connection->remaining_upload_size) && |
2904 | (0 == connection->read_buffer_offset) && | 2904 | (0 == connection->read_buffer_offset) && |
2905 | (MHD_YES == connection->read_closed) ) ) | 2905 | (connection->read_closed) ) ) |
2906 | { | 2906 | { |
2907 | if ((MHD_YES == connection->have_chunked_upload) && | 2907 | if ((MHD_YES == connection->have_chunked_upload) && |
2908 | (MHD_NO == connection->read_closed)) | 2908 | (! connection->read_closed)) |
2909 | connection->state = MHD_CONNECTION_BODY_RECEIVED; | 2909 | connection->state = MHD_CONNECTION_BODY_RECEIVED; |
2910 | else | 2910 | else |
2911 | connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; | 2911 | connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; |
@@ -2921,7 +2921,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
2921 | { | 2921 | { |
2922 | if (connection->state != MHD_CONNECTION_BODY_RECEIVED) | 2922 | if (connection->state != MHD_CONNECTION_BODY_RECEIVED) |
2923 | continue; | 2923 | continue; |
2924 | if (MHD_YES == connection->read_closed) | 2924 | if (connection->read_closed) |
2925 | { | 2925 | { |
2926 | CONNECTION_CLOSE_ERROR (connection, | 2926 | CONNECTION_CLOSE_ERROR (connection, |
2927 | NULL); | 2927 | NULL); |
@@ -2953,7 +2953,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
2953 | { | 2953 | { |
2954 | if (connection->state != MHD_CONNECTION_FOOTER_PART_RECEIVED) | 2954 | if (connection->state != MHD_CONNECTION_FOOTER_PART_RECEIVED) |
2955 | continue; | 2955 | continue; |
2956 | if (MHD_YES == connection->read_closed) | 2956 | if (connection->read_closed) |
2957 | { | 2957 | { |
2958 | CONNECTION_CLOSE_ERROR (connection, | 2958 | CONNECTION_CLOSE_ERROR (connection, |
2959 | NULL); | 2959 | NULL); |
@@ -3144,18 +3144,18 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
3144 | MHD_lookup_connection_value (connection, | 3144 | MHD_lookup_connection_value (connection, |
3145 | MHD_HEADER_KIND, | 3145 | MHD_HEADER_KIND, |
3146 | MHD_HTTP_HEADER_CONNECTION); | 3146 | MHD_HTTP_HEADER_CONNECTION); |
3147 | if ( (MHD_YES == connection->read_closed) || | 3147 | if ( (connection->read_closed) || |
3148 | (client_close) || | 3148 | (client_close) || |
3149 | ( (NULL != end) && | 3149 | ( (NULL != end) && |
3150 | (MHD_str_equal_caseless_ (end, | 3150 | (MHD_str_equal_caseless_ (end, |
3151 | "close")) ) ) | 3151 | "close")) ) ) |
3152 | { | 3152 | { |
3153 | connection->read_closed = MHD_YES; | 3153 | connection->read_closed = true; |
3154 | connection->read_buffer_offset = 0; | 3154 | connection->read_buffer_offset = 0; |
3155 | } | 3155 | } |
3156 | if (((MHD_YES == connection->read_closed) && | 3156 | if ( ( (connection->read_closed) && |
3157 | (0 == connection->read_buffer_offset)) || | 3157 | (0 == connection->read_buffer_offset) ) || |
3158 | (MHD_NO == keepalive_possible (connection))) | 3158 | (MHD_NO == keepalive_possible (connection) ) ) |
3159 | { | 3159 | { |
3160 | /* have to close for some reason */ | 3160 | /* have to close for some reason */ |
3161 | MHD_connection_close_ (connection, | 3161 | MHD_connection_close_ (connection, |
@@ -3252,7 +3252,7 @@ MHD_connection_epoll_update_ (struct MHD_Connection *connection) | |||
3252 | ( (0 == (connection->epoll_state & MHD_EPOLL_STATE_READ_READY)) && | 3252 | ( (0 == (connection->epoll_state & MHD_EPOLL_STATE_READ_READY)) && |
3253 | ( (MHD_EVENT_LOOP_INFO_READ == connection->event_loop_info) || | 3253 | ( (MHD_EVENT_LOOP_INFO_READ == connection->event_loop_info) || |
3254 | (connection->read_buffer_size > connection->read_buffer_offset) ) && | 3254 | (connection->read_buffer_size > connection->read_buffer_offset) ) && |
3255 | (MHD_NO == connection->read_closed) ) ) ) | 3255 | (! connection->read_closed) ) ) ) |
3256 | { | 3256 | { |
3257 | /* add to epoll set */ | 3257 | /* add to epoll set */ |
3258 | struct epoll_event event; | 3258 | struct epoll_event event; |
@@ -3480,7 +3480,7 @@ MHD_queue_response (struct MHD_Connection *connection, | |||
3480 | { | 3480 | { |
3481 | /* response was queued "early", refuse to read body / footers or | 3481 | /* response was queued "early", refuse to read body / footers or |
3482 | further requests! */ | 3482 | further requests! */ |
3483 | connection->read_closed = MHD_YES; | 3483 | connection->read_closed = true; |
3484 | connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; | 3484 | connection->state = MHD_CONNECTION_FOOTERS_RECEIVED; |
3485 | } | 3485 | } |
3486 | if (! connection->in_idle) | 3486 | if (! connection->in_idle) |