diff options
Diffstat (limited to 'src/microhttpd')
-rw-r--r-- | src/microhttpd/connection.c | 9 | ||||
-rw-r--r-- | src/microhttpd/digestauth.c | 2 | ||||
-rw-r--r-- | src/microhttpd/response.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c index 50a5de32..35dd96ab 100644 --- a/src/microhttpd/connection.c +++ b/src/microhttpd/connection.c | |||
@@ -4273,7 +4273,8 @@ get_request_line_inner (struct MHD_Connection *c) | |||
4273 | if (is_empty_line) | 4273 | if (is_empty_line) |
4274 | { | 4274 | { |
4275 | if ((! skip_unlimited_empty_lines) && | 4275 | if ((! skip_unlimited_empty_lines) && |
4276 | (((skip_several_empty_lines) ? MHD_MAX_EMPTY_LINES_SKIP : 1) < | 4276 | (((unsigned int) ((skip_several_empty_lines) ? |
4277 | MHD_MAX_EMPTY_LINES_SKIP : 1)) < | ||
4277 | c->rq.hdrs.rq_line.skipped_empty_lines)) | 4278 | c->rq.hdrs.rq_line.skipped_empty_lines)) |
4278 | { | 4279 | { |
4279 | connection_close_error (c, | 4280 | connection_close_error (c, |
@@ -4823,7 +4824,7 @@ send_redirect_fixed_rq_target (struct MHD_Connection *c) | |||
4823 | static bool | 4824 | static bool |
4824 | process_request_target (struct MHD_Connection *c) | 4825 | process_request_target (struct MHD_Connection *c) |
4825 | { | 4826 | { |
4826 | #if _DEBUG | 4827 | #ifdef _DEBUG |
4827 | size_t params_len; | 4828 | size_t params_len; |
4828 | #endif /* _DEBUG */ | 4829 | #endif /* _DEBUG */ |
4829 | mhd_assert (MHD_CONNECTION_REQ_LINE_RECEIVING == c->state); | 4830 | mhd_assert (MHD_CONNECTION_REQ_LINE_RECEIVING == c->state); |
@@ -4849,7 +4850,7 @@ process_request_target (struct MHD_Connection *c) | |||
4849 | 4850 | ||
4850 | if (NULL != c->rq.hdrs.rq_line.rq_tgt_qmark) | 4851 | if (NULL != c->rq.hdrs.rq_line.rq_tgt_qmark) |
4851 | { | 4852 | { |
4852 | #if _DEBUG | 4853 | #ifdef _DEBUG |
4853 | params_len = | 4854 | params_len = |
4854 | c->rq.hdrs.rq_line.rq_tgt_len | 4855 | c->rq.hdrs.rq_line.rq_tgt_len |
4855 | - (size_t) (c->rq.hdrs.rq_line.rq_tgt_qmark - c->rq.hdrs.rq_line.rq_tgt); | 4856 | - (size_t) (c->rq.hdrs.rq_line.rq_tgt_qmark - c->rq.hdrs.rq_line.rq_tgt); |
@@ -4865,7 +4866,7 @@ process_request_target (struct MHD_Connection *c) | |||
4865 | return false; | 4866 | return false; |
4866 | } | 4867 | } |
4867 | } | 4868 | } |
4868 | #if _DEBUG | 4869 | #ifdef _DEBUG |
4869 | else | 4870 | else |
4870 | params_len = 0; | 4871 | params_len = 0; |
4871 | #endif /* _DEBUG */ | 4872 | #endif /* _DEBUG */ |
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c index ed2610c2..85a46260 100644 --- a/src/microhttpd/digestauth.c +++ b/src/microhttpd/digestauth.c | |||
@@ -333,7 +333,7 @@ struct DigestAlgorithm | |||
333 | /** | 333 | /** |
334 | * Buffer for hex-print of the final digest. | 334 | * Buffer for hex-print of the final digest. |
335 | */ | 335 | */ |
336 | #if _DEBUG | 336 | #ifdef _DEBUG |
337 | bool uninitialised; /**< The structure has been not set-up */ | 337 | bool uninitialised; /**< The structure has been not set-up */ |
338 | bool algo_selected; /**< The algorithm has been selected */ | 338 | bool algo_selected; /**< The algorithm has been selected */ |
339 | bool ready_for_hashing; /**< The structure is ready to hash data */ | 339 | bool ready_for_hashing; /**< The structure is ready to hash data */ |
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c index 3f278689..c594d4f7 100644 --- a/src/microhttpd/response.c +++ b/src/microhttpd/response.c | |||
@@ -1933,7 +1933,9 @@ enum MHD_Result | |||
1933 | MHD_response_execute_upgrade_ (struct MHD_Response *response, | 1933 | MHD_response_execute_upgrade_ (struct MHD_Response *response, |
1934 | struct MHD_Connection *connection) | 1934 | struct MHD_Connection *connection) |
1935 | { | 1935 | { |
1936 | #ifdef HTTPS_SUPPORT | ||
1936 | struct MHD_Daemon *daemon = connection->daemon; | 1937 | struct MHD_Daemon *daemon = connection->daemon; |
1938 | #endif /* HTTPS_SUPPORT */ | ||
1937 | struct MHD_UpgradeResponseHandle *urh; | 1939 | struct MHD_UpgradeResponseHandle *urh; |
1938 | size_t rbo; | 1940 | size_t rbo; |
1939 | 1941 | ||