aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/microhttpd/connection.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 5c825b85..7b630b77 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -353,19 +353,6 @@ socket_start_no_buffering_flush (struct MHD_Connection *connection)
353 353
354 354
355/** 355/**
356 * Activate normal buffering mode on connection socket.
357 *
358 * @param connection connection to be processed
359 * @return true on success, false otherwise
360 */
361_MHD_static_inline bool
362socket_start_normal_buffering (struct MHD_Connection *connection)
363{
364 mhd_assert(NULL != connection);
365}
366
367
368/**
369 * Get all of the headers from the request. 356 * Get all of the headers from the request.
370 * 357 *
371 * @param connection connection to get values from 358 * @param connection connection to get values from
@@ -3471,8 +3458,6 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3471 connection->state = MHD_CONNECTION_CONTINUE_SENT; 3458 connection->state = MHD_CONNECTION_CONTINUE_SENT;
3472 if (socket_flush_possible (connection)) 3459 if (socket_flush_possible (connection))
3473 socket_start_no_buffering_flush (connection); /* REMOVE: Dead */ 3460 socket_start_no_buffering_flush (connection); /* REMOVE: Dead */
3474 else
3475 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3476 3461
3477 continue; 3462 continue;
3478 } 3463 }
@@ -3585,7 +3570,6 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3585#ifdef UPGRADE_SUPPORT 3570#ifdef UPGRADE_SUPPORT
3586 if (NULL != connection->response->upgrade_handler) 3571 if (NULL != connection->response->upgrade_handler)
3587 { 3572 {
3588 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3589 connection->state = MHD_CONNECTION_UPGRADE; 3573 connection->state = MHD_CONNECTION_UPGRADE;
3590 /* This connection is "upgraded". Pass socket to application. */ 3574 /* This connection is "upgraded". Pass socket to application. */
3591 if (MHD_YES != 3575 if (MHD_YES !=
@@ -3607,7 +3591,6 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3607 continue; 3591 continue;
3608 } 3592 }
3609#endif /* UPGRADE_SUPPORT */ 3593#endif /* UPGRADE_SUPPORT */
3610 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3611 3594
3612 if (connection->have_chunked_upload) 3595 if (connection->have_chunked_upload)
3613 connection->state = MHD_CONNECTION_CHUNKED_BODY_UNREADY; 3596 connection->state = MHD_CONNECTION_CHUNKED_BODY_UNREADY;
@@ -3707,8 +3690,6 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3707 } 3690 }
3708 if (socket_flush_possible (connection)) 3691 if (socket_flush_possible (connection))
3709 socket_start_no_buffering_flush (connection); /* REMOVE: Dead */ 3692 socket_start_no_buffering_flush (connection); /* REMOVE: Dead */
3710 else
3711 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3712 3693
3713 MHD_destroy_response (connection->response); 3694 MHD_destroy_response (connection->response);
3714 connection->response = NULL; 3695 connection->response = NULL;
@@ -3736,8 +3717,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3736 else 3717 else
3737 { 3718 {
3738 /* can try to keep-alive */ 3719 /* can try to keep-alive */
3739 if (socket_flush_possible (connection)) 3720
3740 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3741 connection->version = NULL; 3721 connection->version = NULL;
3742 connection->state = MHD_CONNECTION_INIT; 3722 connection->state = MHD_CONNECTION_INIT;
3743 connection->last = NULL; 3723 connection->last = NULL;