aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/connection.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon/connection.c')
-rw-r--r--src/daemon/connection.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/daemon/connection.c b/src/daemon/connection.c
index 08b503d7..60cbfe43 100644
--- a/src/daemon/connection.c
+++ b/src/daemon/connection.c
@@ -654,9 +654,9 @@ MHD_connection_get_fdset (struct MHD_Connection *connection,
654 case MHD_CONNECTION_CONTINUE_SENT: 654 case MHD_CONNECTION_CONTINUE_SENT:
655 if (connection->read_buffer_offset == connection->read_buffer_size) 655 if (connection->read_buffer_offset == connection->read_buffer_size)
656 try_grow_read_buffer (connection); 656 try_grow_read_buffer (connection);
657 if ( (connection->read_buffer_offset < connection->read_buffer_size) && 657 if ((connection->read_buffer_offset < connection->read_buffer_size)
658 (MHD_NO == connection->read_closed) ) 658 && (MHD_NO == connection->read_closed))
659 do_fd_set (fd, read_fd_set, max_fd); 659 do_fd_set (fd, read_fd_set, max_fd);
660 break; 660 break;
661 case MHD_CONNECTION_BODY_RECEIVED: 661 case MHD_CONNECTION_BODY_RECEIVED:
662 case MHD_CONNECTION_FOOTER_PART_RECEIVED: 662 case MHD_CONNECTION_FOOTER_PART_RECEIVED:
@@ -1797,13 +1797,9 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
1797 if (((MHD_YES == connection->read_closed) && 1797 if (((MHD_YES == connection->read_closed) &&
1798 (0 == connection->read_buffer_offset)) || 1798 (0 == connection->read_buffer_offset)) ||
1799 (connection->version == NULL) || 1799 (connection->version == NULL) ||
1800 (connection->method == NULL) || 1800 (0 != strcasecmp (MHD_HTTP_VERSION_1_1, connection->version)))
1801 ( (0 != strcasecmp (MHD_HTTP_METHOD_HEAD, connection->method)) &&
1802 (0 != strcasecmp (MHD_HTTP_METHOD_GET, connection->method)) ) ||
1803 (0 != strcasecmp (MHD_HTTP_VERSION_1_1, connection->version)))
1804 { 1801 {
1805 /* http 1.0, version-less or non-HEAD/GET requests cannot be 1802 /* http 1.0, version-less requests cannot be pipelined */
1806 pipelined */
1807 connection->state = MHD_CONNECTION_CLOSED; 1803 connection->state = MHD_CONNECTION_CLOSED;
1808 MHD_pool_destroy (connection->pool); 1804 MHD_pool_destroy (connection->pool);
1809 connection->pool = NULL; 1805 connection->pool = NULL;
@@ -1832,8 +1828,8 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
1832 break; 1828 break;
1833 } 1829 }
1834 timeout = connection->daemon->connection_timeout; 1830 timeout = connection->daemon->connection_timeout;
1835 if ( (connection->socket_fd != -1) && 1831 if ((connection->socket_fd != -1) &&
1836 (timeout != 0) && (time (NULL) - timeout > connection->last_activity)) 1832 (timeout != 0) && (time (NULL) - timeout > connection->last_activity))
1837 { 1833 {
1838 connection_close_error (connection); 1834 connection_close_error (connection);
1839 return MHD_NO; 1835 return MHD_NO;