aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/microhttpd/connection.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 070fad51..97db6378 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -350,7 +350,7 @@ socket_start_no_buffering_flush (struct MHD_Connection *connection)
350#if defined(TCP_NOPUSH) && !defined(TCP_CORK) 350#if defined(TCP_NOPUSH) && !defined(TCP_CORK)
351 const int dummy = 0; 351 const int dummy = 0;
352#endif /* !TCP_CORK */ 352#endif /* !TCP_CORK */
353 res = socket_start_no_buffering (connection); 353 res = socket_start_no_buffering (connection); /* REMOVE: Dead */
354#if defined(__FreeBSD__) && __FreeBSD__+0 >= 9 354#if defined(__FreeBSD__) && __FreeBSD__+0 >= 9
355 /* FreeBSD do not need zero-send for flushing starting from version 9 */ 355 /* FreeBSD do not need zero-send for flushing starting from version 9 */
356#elif defined(TCP_NOPUSH) && !defined(TCP_CORK) 356#elif defined(TCP_NOPUSH) && !defined(TCP_CORK)
@@ -3460,9 +3460,9 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3460 { 3460 {
3461 connection->state = MHD_CONNECTION_CONTINUE_SENDING; 3461 connection->state = MHD_CONNECTION_CONTINUE_SENDING;
3462 if (socket_flush_possible (connection)) 3462 if (socket_flush_possible (connection))
3463 socket_start_extra_buffering (connection); 3463 socket_start_extra_buffering (connection); /* REMOVE: Dead */
3464 else 3464 else
3465 socket_start_no_buffering (connection); 3465 socket_start_no_buffering (connection); /* REMOVE: Dead */
3466 3466
3467 break; 3467 break;
3468 } 3468 }
@@ -3488,9 +3488,9 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3488 { 3488 {
3489 connection->state = MHD_CONNECTION_CONTINUE_SENT; 3489 connection->state = MHD_CONNECTION_CONTINUE_SENT;
3490 if (socket_flush_possible (connection)) 3490 if (socket_flush_possible (connection))
3491 socket_start_no_buffering_flush (connection); 3491 socket_start_no_buffering_flush (connection); /* REMOVE: Dead */
3492 else 3492 else
3493 socket_start_normal_buffering (connection); 3493 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3494 3494
3495 continue; 3495 continue;
3496 } 3496 }
@@ -3592,9 +3592,9 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3592 } 3592 }
3593 connection->state = MHD_CONNECTION_HEADERS_SENDING; 3593 connection->state = MHD_CONNECTION_HEADERS_SENDING;
3594 if (socket_flush_possible (connection)) 3594 if (socket_flush_possible (connection))
3595 socket_start_extra_buffering (connection); 3595 socket_start_extra_buffering (connection); /* REMOVE: Dead */
3596 else 3596 else
3597 socket_start_no_buffering (connection); 3597 socket_start_no_buffering (connection); /* REMOVE: Dead */
3598 3598
3599 break; 3599 break;
3600 case MHD_CONNECTION_HEADERS_SENDING: 3600 case MHD_CONNECTION_HEADERS_SENDING:
@@ -3603,12 +3603,12 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3603 case MHD_CONNECTION_HEADERS_SENT: 3603 case MHD_CONNECTION_HEADERS_SENT:
3604 /* Some clients may take some actions right after header receive */ 3604 /* Some clients may take some actions right after header receive */
3605 if (socket_flush_possible (connection)) 3605 if (socket_flush_possible (connection))
3606 socket_start_no_buffering_flush (connection); 3606 socket_start_no_buffering_flush (connection); /* REMOVE: Dead */
3607 3607
3608#ifdef UPGRADE_SUPPORT 3608#ifdef UPGRADE_SUPPORT
3609 if (NULL != connection->response->upgrade_handler) 3609 if (NULL != connection->response->upgrade_handler)
3610 { 3610 {
3611 socket_start_normal_buffering (connection); 3611 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3612 connection->state = MHD_CONNECTION_UPGRADE; 3612 connection->state = MHD_CONNECTION_UPGRADE;
3613 /* This connection is "upgraded". Pass socket to application. */ 3613 /* This connection is "upgraded". Pass socket to application. */
3614 if (MHD_YES != 3614 if (MHD_YES !=
@@ -3631,9 +3631,9 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3631 } 3631 }
3632#endif /* UPGRADE_SUPPORT */ 3632#endif /* UPGRADE_SUPPORT */
3633 if (socket_flush_possible (connection)) 3633 if (socket_flush_possible (connection))
3634 socket_start_extra_buffering (connection); 3634 socket_start_extra_buffering (connection); /* REMOVE: Dead */
3635 else 3635 else
3636 socket_start_normal_buffering (connection); 3636 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3637 3637
3638 if (connection->have_chunked_upload) 3638 if (connection->have_chunked_upload)
3639 connection->state = MHD_CONNECTION_CHUNKED_BODY_UNREADY; 3639 connection->state = MHD_CONNECTION_CHUNKED_BODY_UNREADY;
@@ -3666,7 +3666,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3666 connection->state = MHD_CONNECTION_NORMAL_BODY_READY; 3666 connection->state = MHD_CONNECTION_NORMAL_BODY_READY;
3667 /* Buffering for flushable socket was already enabled*/ 3667 /* Buffering for flushable socket was already enabled*/
3668 if (socket_flush_possible (connection)) 3668 if (socket_flush_possible (connection))
3669 socket_start_no_buffering (connection); 3669 socket_start_no_buffering (connection); /* REMOVE: Dead */
3670 break; 3670 break;
3671 } 3671 }
3672 /* mutex was already unlocked by "try_ready_normal_body */ 3672 /* mutex was already unlocked by "try_ready_normal_body */
@@ -3700,7 +3700,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3700 connection->state = MHD_CONNECTION_CHUNKED_BODY_READY; 3700 connection->state = MHD_CONNECTION_CHUNKED_BODY_READY;
3701 /* Buffering for flushable socket was already enabled */ 3701 /* Buffering for flushable socket was already enabled */
3702 if (socket_flush_possible (connection)) 3702 if (socket_flush_possible (connection))
3703 socket_start_no_buffering (connection); 3703 socket_start_no_buffering (connection); /* REMOVE: Dead */
3704 continue; 3704 continue;
3705 } 3705 }
3706 /* mutex was already unlocked by try_ready_chunked_body */ 3706 /* mutex was already unlocked by try_ready_chunked_body */
@@ -3734,9 +3734,9 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3734 continue; 3734 continue;
3735 } 3735 }
3736 if (socket_flush_possible (connection)) 3736 if (socket_flush_possible (connection))
3737 socket_start_no_buffering_flush (connection); 3737 socket_start_no_buffering_flush (connection); /* REMOVE: Dead */
3738 else 3738 else
3739 socket_start_normal_buffering (connection); 3739 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3740 3740
3741 MHD_destroy_response (connection->response); 3741 MHD_destroy_response (connection->response);
3742 connection->response = NULL; 3742 connection->response = NULL;
@@ -3765,7 +3765,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
3765 { 3765 {
3766 /* can try to keep-alive */ 3766 /* can try to keep-alive */
3767 if (socket_flush_possible (connection)) 3767 if (socket_flush_possible (connection))
3768 socket_start_normal_buffering (connection); 3768 socket_start_normal_buffering (connection); /* REMOVE: Dead */
3769 connection->version = NULL; 3769 connection->version = NULL;
3770 connection->state = MHD_CONNECTION_INIT; 3770 connection->state = MHD_CONNECTION_INIT;
3771 connection->last = NULL; 3771 connection->last = NULL;