diff options
Diffstat (limited to 'src/microhttpd/connection.c')
-rw-r--r-- | src/microhttpd/connection.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c index 1dca8f94..18bb36d6 100644 --- a/src/microhttpd/connection.c +++ b/src/microhttpd/connection.c | |||
@@ -5103,9 +5103,13 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
5103 | connection->state = MHD_CONNECTION_FULL_REPLY_SENT; | 5103 | connection->state = MHD_CONNECTION_FULL_REPLY_SENT; |
5104 | continue; | 5104 | continue; |
5105 | case MHD_CONNECTION_NORMAL_BODY_READY: | 5105 | case MHD_CONNECTION_NORMAL_BODY_READY: |
5106 | mhd_assert (connection->rp.props.send_reply_body); | ||
5107 | mhd_assert (! connection->rp.props.chunked); | ||
5106 | /* nothing to do here */ | 5108 | /* nothing to do here */ |
5107 | break; | 5109 | break; |
5108 | case MHD_CONNECTION_NORMAL_BODY_UNREADY: | 5110 | case MHD_CONNECTION_NORMAL_BODY_UNREADY: |
5111 | mhd_assert (connection->rp.props.send_reply_body); | ||
5112 | mhd_assert (! connection->rp.props.chunked); | ||
5109 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) | 5113 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) |
5110 | if (NULL != connection->rp.response->crc) | 5114 | if (NULL != connection->rp.response->crc) |
5111 | MHD_mutex_lock_chk_ (&connection->rp.response->mutex); | 5115 | MHD_mutex_lock_chk_ (&connection->rp.response->mutex); |
@@ -5137,9 +5141,13 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
5137 | /* not ready, no socket action */ | 5141 | /* not ready, no socket action */ |
5138 | break; | 5142 | break; |
5139 | case MHD_CONNECTION_CHUNKED_BODY_READY: | 5143 | case MHD_CONNECTION_CHUNKED_BODY_READY: |
5144 | mhd_assert (connection->rp.props.send_reply_body); | ||
5145 | mhd_assert (connection->rp.props.chunked); | ||
5140 | /* nothing to do here */ | 5146 | /* nothing to do here */ |
5141 | break; | 5147 | break; |
5142 | case MHD_CONNECTION_CHUNKED_BODY_UNREADY: | 5148 | case MHD_CONNECTION_CHUNKED_BODY_UNREADY: |
5149 | mhd_assert (connection->rp.props.send_reply_body); | ||
5150 | mhd_assert (connection->rp.props.chunked); | ||
5143 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) | 5151 | #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) |
5144 | if (NULL != connection->rp.response->crc) | 5152 | if (NULL != connection->rp.response->crc) |
5145 | MHD_mutex_lock_chk_ (&connection->rp.response->mutex); | 5153 | MHD_mutex_lock_chk_ (&connection->rp.response->mutex); |
@@ -5172,7 +5180,10 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
5172 | } | 5180 | } |
5173 | break; | 5181 | break; |
5174 | case MHD_CONNECTION_CHUNKED_BODY_SENT: | 5182 | case MHD_CONNECTION_CHUNKED_BODY_SENT: |
5183 | mhd_assert (connection->rp.props.send_reply_body); | ||
5175 | mhd_assert (connection->rp.props.chunked); | 5184 | mhd_assert (connection->rp.props.chunked); |
5185 | mhd_assert (connection->write_buffer_send_offset <= \ | ||
5186 | connection->write_buffer_append_offset); | ||
5176 | 5187 | ||
5177 | if (MHD_NO == build_connection_chunked_response_footer (connection)) | 5188 | if (MHD_NO == build_connection_chunked_response_footer (connection)) |
5178 | { | 5189 | { |
@@ -5191,6 +5202,8 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
5191 | connection->state = MHD_CONNECTION_FOOTERS_SENDING; | 5202 | connection->state = MHD_CONNECTION_FOOTERS_SENDING; |
5192 | continue; | 5203 | continue; |
5193 | case MHD_CONNECTION_FOOTERS_SENDING: | 5204 | case MHD_CONNECTION_FOOTERS_SENDING: |
5205 | mhd_assert (connection->rp.props.send_reply_body); | ||
5206 | mhd_assert (connection->rp.props.chunked); | ||
5194 | /* no default action */ | 5207 | /* no default action */ |
5195 | break; | 5208 | break; |
5196 | case MHD_CONNECTION_FULL_REPLY_SENT: | 5209 | case MHD_CONNECTION_FULL_REPLY_SENT: |