From 68410327d58e985f0ec025069f396059dd956de8 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Tue, 25 Feb 2020 18:11:47 +0100 Subject: [PATCH] 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 --- jcc.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) 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); } -- 2.39.2