From 33f7c19c89a73da5e7e195c6f5185b09f7d59b9f Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Tue, 25 Feb 2020 17:54:34 +0100 Subject: [PATCH] get_url_actions(): Don't initialize actions when called the second time Sponsored by: Robert Klemme --- filters.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/filters.c b/filters.c index 0d36485d..d29d422f 100644 --- a/filters.c +++ b/filters.c @@ -2300,7 +2300,20 @@ void get_url_actions(struct client_state *csp, struct http_request *http) struct url_actions *b; int i; - init_current_action(csp->action); +#ifdef FEATURE_HTTPS_FILTERING + if (!csp->http->client_ssl) +#endif + { + /* + * When filtering TLS traffic this function gets called a + * second time after the encrypted headers have been received. + * + * Only initialize the first time. The second time we apply + * the newly set actions on top of the ones that were set + * the first time. + */ + init_current_action(csp->action); + } for (i = 0; i < MAX_AF_FILES; i++) { -- 2.39.2