From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 25 Feb 2020 17:11:47 +0000 (+0100)
Subject: process_encrypted_request(): Don't call init_current_action() when toggled off
X-Git-Tag: v_3_0_29~482
X-Git-Url: http://www.privoxy.org/gitweb/contact.html?a=commitdiff_plain;h=68410327d58e985f0ec025069f396059dd956de8;p=privoxy.git

process_encrypted_request(): Don't call init_current_action() when toggled off

By the time the function is called the actions are already
initialized.

Sponsored by: Robert Klemme
---

diff --git a/jcc.c b/jcc.c
index 0ca5b5d4..1c8ee1fc 100644
--- a/jcc.c
+++ b/jcc.c
@@ -2313,18 +2313,11 @@ static jb_err process_encrypted_request(struct client_state *csp)
    init_domain_components(csp->http);
 #endif
 
-   /*
-    * Determine the actions for this URL
-    */
 #ifdef FEATURE_TOGGLE
-   if (!(csp->flags & CSP_FLAG_TOGGLED_ON))
-   {
-      /* Most compatible set of actions (i.e. none) */
-      init_current_action(csp->action);
-   }
-   else
-#endif /* ndef FEATURE_TOGGLE */
+   if ((csp->flags & CSP_FLAG_TOGGLED_ON) != 0)
+#endif
    {
+      /* Determine the actions for this URL */
       get_url_actions(csp, csp->http);
    }