diff options
Diffstat (limited to 'src/microhttpd/connection.c')
-rw-r--r-- | src/microhttpd/connection.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c index eafcd98a..48a07cf4 100644 --- a/src/microhttpd/connection.c +++ b/src/microhttpd/connection.c | |||
@@ -984,7 +984,8 @@ get_next_header_line (struct MHD_Connection *connection) | |||
984 | while ((pos < connection->read_buffer_offset - 1) && | 984 | while ((pos < connection->read_buffer_offset - 1) && |
985 | ('\r' != rbuf[pos]) && ('\n' != rbuf[pos])) | 985 | ('\r' != rbuf[pos]) && ('\n' != rbuf[pos])) |
986 | pos++; | 986 | pos++; |
987 | if (pos == connection->read_buffer_offset - 1) | 987 | if ( (pos == connection->read_buffer_offset - 1) && |
988 | ('\n' != rbuf[pos]) ) | ||
988 | { | 989 | { |
989 | /* not found, consider growing... */ | 990 | /* not found, consider growing... */ |
990 | if ( (connection->read_buffer_offset == connection->read_buffer_size) && | 991 | if ( (connection->read_buffer_offset == connection->read_buffer_size) && |
@@ -1247,11 +1248,10 @@ parse_initial_message_line (struct MHD_Connection *connection, char *line) | |||
1247 | http_version[0] = '\0'; | 1248 | http_version[0] = '\0'; |
1248 | http_version++; | 1249 | http_version++; |
1249 | } | 1250 | } |
1250 | if (connection->daemon->uri_log_callback != NULL) | 1251 | if (NULL != connection->daemon->uri_log_callback) |
1251 | connection->client_context | 1252 | connection->client_context |
1252 | = | 1253 | = connection->daemon->uri_log_callback (connection->daemon->uri_log_callback_cls, |
1253 | connection->daemon->uri_log_callback (connection->daemon-> | 1254 | uri); |
1254 | uri_log_callback_cls, uri); | ||
1255 | args = strchr (uri, '?'); | 1255 | args = strchr (uri, '?'); |
1256 | if (NULL != args) | 1256 | if (NULL != args) |
1257 | { | 1257 | { |
@@ -2118,7 +2118,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection) | |||
2118 | continue; | 2118 | continue; |
2119 | case MHD_CONNECTION_URL_RECEIVED: | 2119 | case MHD_CONNECTION_URL_RECEIVED: |
2120 | line = get_next_header_line (connection); | 2120 | line = get_next_header_line (connection); |
2121 | if (line == NULL) | 2121 | if (NULL == line) |
2122 | { | 2122 | { |
2123 | if (MHD_CONNECTION_URL_RECEIVED != connection->state) | 2123 | if (MHD_CONNECTION_URL_RECEIVED != connection->state) |
2124 | continue; | 2124 | continue; |