From b61e2a0f81face4aca7311ea45d9b382cde0d627 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 17 Oct 2012 18:18:54 +0000 Subject: [PATCH] Rename ACTION_NO_COOKIE_SET to ACTION_CRUNCH_INCOMING_COOKIES to match the current name of the action --- actionlist.h | 8 ++++---- parsers.c | 4 ++-- project.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/actionlist.h b/actionlist.h index 922b607b..e50c7c37 100644 --- a/actionlist.h +++ b/actionlist.h @@ -63,7 +63,7 @@ DEFINE_CGI_PARAM_NO_RADIO("content-type-overwrite", ACTION_CONTENT_TYPE_OVER DEFINE_ACTION_STRING ("crunch-client-header", ACTION_CRUNCH_CLIENT_HEADER, ACTION_STRING_CLIENT_HEADER) DEFINE_CGI_PARAM_NO_RADIO("crunch-client-header", ACTION_CRUNCH_CLIENT_HEADER, ACTION_STRING_CLIENT_HEADER, "X-Whatever:") DEFINE_ACTION_BOOL ("crunch-if-none-match", ACTION_CRUNCH_IF_NONE_MATCH) -DEFINE_ACTION_BOOL ("crunch-incoming-cookies", ACTION_NO_COOKIE_SET) +DEFINE_ACTION_BOOL ("crunch-incoming-cookies", ACTION_CRUNCH_INCOMING_COOKIES) DEFINE_ACTION_BOOL ("crunch-outgoing-cookies", ACTION_NO_COOKIE_READ) DEFINE_ACTION_STRING ("crunch-server-header", ACTION_CRUNCH_SERVER_HEADER, ACTION_STRING_SERVER_HEADER) DEFINE_CGI_PARAM_NO_RADIO("crunch-server-header", ACTION_CRUNCH_SERVER_HEADER, ACTION_STRING_SERVER_HEADER, "X-Whatever:") @@ -137,9 +137,9 @@ DEFINE_ACTION_MULTI ("filter-server-headers", ACTION_MULTI_SERVER_HEA * Pre-3.0 compatibility */ DEFINE_ACTION_BOOL ("no-cookie-read", ACTION_NO_COOKIE_READ) -DEFINE_ACTION_BOOL ("no-cookie-set", ACTION_NO_COOKIE_SET) +DEFINE_ACTION_BOOL ("no-cookie-set", ACTION_CRUNCH_INCOMING_COOKIES) DEFINE_ACTION_BOOL ("prevent-reading-cookies", ACTION_NO_COOKIE_READ) -DEFINE_ACTION_BOOL ("prevent-setting-cookies", ACTION_NO_COOKIE_SET) +DEFINE_ACTION_BOOL ("prevent-setting-cookies", ACTION_CRUNCH_INCOMING_COOKIES) DEFINE_ACTION_BOOL ("downgrade", ACTION_DOWNGRADE) DEFINE_ACTION_STRING ("hide-from", ACTION_HIDE_FROM, ACTION_STRING_FROM) DEFINE_ACTION_BOOL ("image", ACTION_IMAGE) @@ -147,7 +147,7 @@ DEFINE_ACTION_STRING ("image-blocker", ACTION_IMAGE_BLOCKER, ACT DEFINE_ACTION_BOOL ("no-compression", ACTION_NO_COMPRESSION) DEFINE_ACTION_BOOL ("no-cookies-keep", ACTION_NO_COOKIE_KEEP) DEFINE_ACTION_BOOL ("no-cookies-read", ACTION_NO_COOKIE_READ) -DEFINE_ACTION_BOOL ("no-cookies-set", ACTION_NO_COOKIE_SET) +DEFINE_ACTION_BOOL ("no-cookies-set", ACTION_CRUNCH_INCOMING_COOKIES) #endif /* if DEFINE_ACTION_ALIAS */ #undef DEFINE_ACTION_MULTI diff --git a/parsers.c b/parsers.c index 536d57d9..cc410be1 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,4 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.252 2012/09/18 17:39:29 fabiankeil Exp $"; +const char parsers_rcs[] = "$Id: parsers.c,v 1.253 2012/10/12 11:10:10 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -3817,7 +3817,7 @@ static jb_err server_set_cookie(struct client_state *csp, char **header) time(&now); - if ((csp->action->flags & ACTION_NO_COOKIE_SET) != 0) + if ((csp->action->flags & ACTION_CRUNCH_INCOMING_COOKIES) != 0) { log_error(LOG_LEVEL_HEADER, "Crunching incoming cookie: %s", *header); freez(*header); diff --git a/project.h b/project.h index 1c000b06..66d9e00b 100644 --- a/project.h +++ b/project.h @@ -1,7 +1,7 @@ #ifndef PROJECT_H_INCLUDED #define PROJECT_H_INCLUDED /** Version string. */ -#define PROJECT_H_VERSION "$Id: project.h,v 1.178 2012/07/27 17:36:06 fabiankeil Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 1.179 2012/09/04 08:32:03 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ @@ -479,8 +479,8 @@ struct iob #define ACTION_NO_COOKIE_KEEP 0x00000800UL /** Action bitmap: Block rending cookies. */ #define ACTION_NO_COOKIE_READ 0x00001000UL -/** Action bitmap: Block setting cookies. */ -#define ACTION_NO_COOKIE_SET 0x00002000UL +/** Action bitmap: Block cookies coming from the server. */ +#define ACTION_CRUNCH_INCOMING_COOKIES 0x00002000UL /** Action bitmap: Override the forward settings in the config file */ #define ACTION_FORWARD_OVERRIDE 0x00004000UL /** Action bitmap: Block as empty document */ -- 2.39.2