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 0ca5b5d..1c8ee1f 100644 (file)
--- 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
 
    init_domain_components(csp->http);
 #endif
 

-   /*
-    * Determine the actions for this URL
-    */

 #ifdef FEATURE_TOGGLE
 #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);
    }
 
       get_url_actions(csp, csp->http);
    }