Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
authorLee <ler762@users.sourceforge.net>
Sun, 21 Mar 2021 19:24:57 +0000 (15:24 -0400)
committerLee <ler762@users.sourceforge.net>
Sun, 21 Mar 2021 19:24:57 +0000 (15:24 -0400)
1  2 
jcc.c

diff --combined jcc.c
--- 1/jcc.c
--- 2/jcc.c
+++ b/jcc.c
@@@ -2871,7 -2871,6 +2871,6 @@@ static jb_err process_encrypted_request
     }
  
     log_error(LOG_LEVEL_HEADER, "Encrypted request processed");
-    log_applied_actions(csp->action);
     log_error(LOG_LEVEL_REQUEST, "https://%s%s", csp->http->hostport,
        csp->http->path);
  
@@@ -2977,6 -2976,8 +2976,8 @@@ static void continue_https_chat(struct 
        return;
     }
  
+    log_applied_actions(csp->action);
     log_error(LOG_LEVEL_CONNECT,
        "Reusing server socket %d connected to %s. Requests already sent: %u.",
        csp->server_connection.sfd, csp->server_connection.host,
@@@ -6134,7 -6135,7 +6135,7 @@@ static void listen_loop(void
           }
  #endif
  
 -#if defined(_WIN32) && !defined(_CYGWIN) && !defined(SELECTED_ONE_OPTION)
 +#if defined(_WIN32) && !defined(SELECTED_ONE_OPTION)
  #define SELECTED_ONE_OPTION
           child_id = _beginthread(
              (void (*)(void *))serve,