Fix socks4 and socks4a support under glibc's source fortification

[privoxy.git] / jcc.c

diff --git a/jcc.c b/jcc.c
index 02f6f25..0a6c64e 100644 (file)
--- 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
@@ -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;
                   }
@@ -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;
       }