diff options
Diffstat (limited to 'src/microhttpd')
-rw-r--r-- | src/microhttpd/mhd_send.c | 8 | ||||
-rw-r--r-- | src/microhttpd/postprocessor.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c index fd6297aa..0864d532 100644 --- a/src/microhttpd/mhd_send.c +++ b/src/microhttpd/mhd_send.c | |||
@@ -357,7 +357,7 @@ MHD_send_on_connection_ (struct MHD_Connection *connection, | |||
357 | else if (buffer_size > (size_t) ret) | 357 | else if (buffer_size > (size_t) ret) |
358 | connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY; | 358 | connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY; |
359 | #endif /* EPOLL_SUPPORT */ | 359 | #endif /* EPOLL_SUPPORT */ |
360 | if (ret == buffer_size) | 360 | if (buffer_size == (size_t) ret) |
361 | post_cork_setsockopt (connection, want_cork); | 361 | post_cork_setsockopt (connection, want_cork); |
362 | } | 362 | } |
363 | 363 | ||
@@ -398,7 +398,7 @@ MHD_send_on_connection2_ (struct MHD_Connection *connection, | |||
398 | header, | 398 | header, |
399 | header_size, | 399 | header_size, |
400 | MHD_SSO_HDR_CORK); | 400 | MHD_SSO_HDR_CORK); |
401 | if ( (ret == header_size) && | 401 | if ( (header_size == (size_t) ret) && |
402 | (0 == buffer_size) && | 402 | (0 == buffer_size) && |
403 | connection->sk_cork_on) | 403 | connection->sk_cork_on) |
404 | { | 404 | { |
@@ -443,7 +443,7 @@ MHD_send_on_connection2_ (struct MHD_Connection *connection, | |||
443 | 443 | ||
444 | /* Only if we succeeded sending the full buffer, we need to make sure that | 444 | /* Only if we succeeded sending the full buffer, we need to make sure that |
445 | the OS flushes at the end */ | 445 | the OS flushes at the end */ |
446 | if (ret == header_size + buffer_size) | 446 | if (header_size + buffer_size == (size_t) ret) |
447 | post_cork_setsockopt (connection, false); | 447 | post_cork_setsockopt (connection, false); |
448 | 448 | ||
449 | return ret; | 449 | return ret; |
@@ -665,7 +665,7 @@ MHD_send_sendfile_ (struct MHD_Connection *connection) | |||
665 | 665 | ||
666 | /* Make sure we send the data without delay ONLY if we | 666 | /* Make sure we send the data without delay ONLY if we |
667 | provided the complete response (not on partial write) */ | 667 | provided the complete response (not on partial write) */ |
668 | if (ret == left) | 668 | if (left == (uint64_t) ret) |
669 | post_cork_setsockopt (connection, false); | 669 | post_cork_setsockopt (connection, false); |
670 | 670 | ||
671 | return ret; | 671 | return ret; |
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c index 0069147b..9c464152 100644 --- a/src/microhttpd/postprocessor.c +++ b/src/microhttpd/postprocessor.c | |||
@@ -391,7 +391,7 @@ process_value (struct MHD_PostProcessor *pp, | |||
391 | pp->xbuf_pos = 0; | 391 | pp->xbuf_pos = 0; |
392 | if (NULL != last_escape) | 392 | if (NULL != last_escape) |
393 | { | 393 | { |
394 | if (value_end - last_escape < sizeof (pp->xbuf)) | 394 | if (((size_t) (value_end - last_escape)) < sizeof (pp->xbuf)) |
395 | { | 395 | { |
396 | pp->xbuf_pos = value_end - last_escape; | 396 | pp->xbuf_pos = value_end - last_escape; |
397 | memcpy (pp->xbuf, | 397 | memcpy (pp->xbuf, |