X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.c;h=4b69424b258b4830ac164b4eeed11cd3e19e1632;hb=95d956627919c1fbe5f3cc90396717a17927935d;hp=ecb27b9d7085d9f4306205407125567ae5b2eba8;hpb=b55bdc6ca9363694aedace28f111a9b5c504a25f;p=privoxy.git diff --git a/jcc.c b/jcc.c index ecb27b9d..4b69424b 100644 --- a/jcc.c +++ b/jcc.c @@ -2122,12 +2122,12 @@ static int read_http_request_body(struct client_state *csp) if (to_read != 0) { log_error(LOG_LEVEL_CONNECT, - "Not enough request body has been read: expected %lu more bytes", + "Not enough request body has been read: expected %lu more bytes.", to_read); return 1; } log_error(LOG_LEVEL_CONNECT, - "The last %d bytes of the request body have been read", len); + "The last %d bytes of the request body have been read.", len); return 0; } @@ -2302,7 +2302,7 @@ static int read_https_request_body(struct client_state *csp) if (len <= 0) { log_error(LOG_LEVEL_CONNECT, - "Did not receive the whole encrypted request body from %s", + "Did not receive the whole encrypted request body from %s.", csp->ip_addr_str); return 1; } @@ -2316,13 +2316,13 @@ static int read_https_request_body(struct client_state *csp) if (to_read != 0) { log_error(LOG_LEVEL_CONNECT, - "Not enough encrypted request body has been read: expected %lu more bytes", + "Not enough encrypted request body has been read: expected %lu more bytes.", to_read); return 1; } log_error(LOG_LEVEL_CONNECT, - "The last %llu bytes of the encrypted request body have been read", + "The last %llu bytes of the encrypted request body have been read.", csp->expected_client_content_length); return 0; } @@ -2345,9 +2345,8 @@ static int receive_and_send_encrypted_post_data(struct client_state *csp) { int content_length_known = csp->expected_client_content_length != 0; - while ((content_length_known && csp->expected_client_content_length != 0) || - (is_ssl_pending(&(csp->ssl_client_attr)) || - data_is_available(csp->cfd, csp->config->socket_timeout))) + while (is_ssl_pending(&(csp->ssl_client_attr)) + || (content_length_known && csp->expected_client_content_length != 0)) { unsigned char buf[BUFFER_SIZE]; int len; @@ -4167,8 +4166,8 @@ static void handle_established_connection(struct client_state *csp) */ if (chunk_offset >= len) { - log_error(LOG_LEVEL_CONNECT, - "Reducing chunk offset from %lu to %lu after flushing %ld bytes", + log_error(LOG_LEVEL_CONNECT, "Reducing the chunk offset " + "from %lu to %lu after flushing %ld bytes.", chunk_offset, (chunk_offset - (unsigned)len), len); chunk_offset = chunk_offset - (unsigned)len; }