summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-08-01 21:17:46 +0200
committerChristian Grothoff <christian@grothoff.org>2019-08-01 21:17:46 +0200
commit8a4aec4d78fe4fb335aede980e8567b8bc51858f (patch)
tree666a9827d15f4859d6200dac795d5ae80b6d0a88
parentd21cf2c1c225c888a3fd6161a6a04357714cc628 (diff)
properly handle return value from send_on_connection2
-rw-r--r--src/microhttpd/connection.c77
1 files changed, 45 insertions, 32 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index dab28878..67ff6017 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -3180,42 +3180,55 @@ MHD_connection_handle_write (struct MHD_Connection *connection)
mhd_assert (0);
return;
case MHD_CONNECTION_HEADERS_SENDING:
- /* if the response body is not available, we use MHD_send_on_connection_() */
- if (NULL != connection->response->crc)
- {
- ret = MHD_send_on_connection_ (connection,
- &connection->write_buffer
- [connection->write_buffer_send_offset],
- connection->write_buffer_append_offset -
- connection->write_buffer_send_offset,
- MHD_SSO_MAY_CORK);
- }
- else
- {
- ret = MHD_send_on_connection2_ (connection,
- &connection->write_buffer
- [connection->write_buffer_send_offset],
- connection->write_buffer_append_offset -
- connection->write_buffer_send_offset,
- connection->response->data,
- connection->response->data_buffer_size);
- }
+ {
+ const size_t wb_ready =connection->write_buffer_append_offset -
+ connection->write_buffer_send_offset;
- if (ret < 0)
- {
- if (MHD_ERR_AGAIN_ == ret)
+ /* if the response body is not available, we use MHD_send_on_connection_() */
+ if (NULL != connection->response->crc)
+ {
+ ret = MHD_send_on_connection_ (connection,
+ &connection->write_buffer
+ [connection->write_buffer_send_offset],
+ wb_ready,
+ MHD_SSO_MAY_CORK);
+ }
+ else
+ {
+ ret = MHD_send_on_connection2_ (connection,
+ &connection->write_buffer
+ [connection->write_buffer_send_offset],
+ wb_ready,
+ connection->response->data,
+ connection->response->data_buffer_size);
+ }
+
+ if (ret < 0)
+ {
+ if (MHD_ERR_AGAIN_ == ret)
+ return;
+ CONNECTION_CLOSE_ERROR (connection,
+ _("Connection was closed while sending response headers.\n"));
return;
- CONNECTION_CLOSE_ERROR (connection,
- _("Connection was closed while sending response headers.\n"));
+ }
+ if (ret > wb_ready)
+ {
+ mhd_assert (NULL == connection->repsonse->crc);
+ /* We sent not just header data but also some response data,
+ update both offsets! */
+ connection->write_buffer_send_offset += wb_ready;
+ ret -= wb_ready;
+ connection->response_write_position += ret;
+ }
+ else
+ connection->write_buffer_send_offset += ret;
+ MHD_update_last_activity_ (connection);
+ if (MHD_CONNECTION_HEADERS_SENDING != connection->state)
return;
- }
- connection->write_buffer_send_offset += ret;
- MHD_update_last_activity_ (connection);
- if (MHD_CONNECTION_HEADERS_SENDING != connection->state)
+ check_write_done (connection,
+ MHD_CONNECTION_HEADERS_SENT);
return;
- check_write_done (connection,
- MHD_CONNECTION_HEADERS_SENT);
- return;
+ }
case MHD_CONNECTION_HEADERS_SENT:
return;
case MHD_CONNECTION_NORMAL_BODY_READY: