X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.c;h=5ed93b35688cb7feaba64cfff0d3d205b6e932e4;hb=HEAD;hp=ecb27b9d7085d9f4306205407125567ae5b2eba8;hpb=b55bdc6ca9363694aedace28f111a9b5c504a25f;p=privoxy.git

diff --git a/jcc.c b/jcc.c
index ecb27b9d..0e110a3c 100644
--- a/jcc.c
+++ b/jcc.c
@@ -5,7 +5,7 @@
  * Purpose     :  Main file.  Contains main() method, main loop, and
  *                the main connection-handling function.
  *
- * Copyright   :  Written by and Copyright (C) 2001-2022 the
+ * Copyright   :  Written by and Copyright (C) 2001-2023 the
  *                Privoxy team. https://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -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;
@@ -2511,12 +2510,12 @@ static jb_err receive_encrypted_request_headers(struct client_state *csp)
 
    do
    {
-      log_error(LOG_LEVEL_HEADER, "Waiting for encrypted client headers");
+      log_error(LOG_LEVEL_HEADER, "Waiting for encrypted client headers.");
       if (!is_ssl_pending(&(csp->ssl_client_attr)) &&
           !data_is_available(csp->cfd, csp->config->socket_timeout))
       {
          log_error(LOG_LEVEL_CONNECT,
-            "Socket %d timed out while waiting for client headers", csp->cfd);
+            "Socket %d timed out while waiting for client headers.", csp->cfd);
          return JB_ERR_PARSE;
       }
       len = ssl_recv_data(&(csp->ssl_client_attr),
@@ -2524,7 +2523,7 @@ static jb_err receive_encrypted_request_headers(struct client_state *csp)
       if (len == 0)
       {
          log_error(LOG_LEVEL_CONNECT,
-            "Socket %d closed while waiting for client headers", csp->cfd);
+            "Socket %d closed while waiting for client headers.", csp->cfd);
          return JB_ERR_PARSE;
       }
       if (len == -1)
@@ -2538,7 +2537,7 @@ static jb_err receive_encrypted_request_headers(struct client_state *csp)
       p = strstr(csp->client_iob->cur, "\r\n\r\n");
    } while (p == NULL);
 
-   log_error(LOG_LEVEL_HEADER, "Encrypted headers received completely");
+   log_error(LOG_LEVEL_HEADER, "Encrypted headers received completely.");
 
    return JB_ERR_OK;
 }
@@ -4167,15 +4166,15 @@ 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;
                   }
                   else
                   {
                      log_error(LOG_LEVEL_CONNECT,
-                        "Keeping chunk offset at %lu despite flushing %ld bytes",
+                        "Keeping chunk offset at %lu despite flushing %ld bytes.",
                         chunk_offset, len);
                      /*
                       * If we can't parse the chunk-encoded data we should
@@ -6270,7 +6269,8 @@ static void listen_loop(void)
 
       if (!accept_connection(csp, bfds))
       {
-         log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
+         log_error(LOG_LEVEL_CONNECT,
+            "Failed to accept() incoming connection: %E");
          freez(csp_list);
          continue;
       }