From cdce239fb2f8a54963856a048976898f0003df20 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 17 Oct 2012 18:19:59 +0000 Subject: [PATCH] Rename ACTION_NO_COOKIE_KEEP to ACTION_SESSION_COOKIES_ONLY to match the current name of the action --- actionlist.h | 6 +++--- parsers.c | 4 ++-- project.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/actionlist.h b/actionlist.h index 700388ac..44dee76c 100644 --- a/actionlist.h +++ b/actionlist.h @@ -113,7 +113,7 @@ DEFINE_ACTION_STRING ("redirect", ACTION_REDIRECT, DEFINE_CGI_PARAM_NO_RADIO("redirect", ACTION_REDIRECT, ACTION_STRING_REDIRECT, "http://localhost/") DEFINE_ACTION_MULTI ("server-header-filter", ACTION_MULTI_SERVER_HEADER_FILTER) DEFINE_ACTION_MULTI ("server-header-tagger", ACTION_MULTI_SERVER_HEADER_TAGGER) -DEFINE_ACTION_BOOL ("session-cookies-only", ACTION_NO_COOKIE_KEEP) +DEFINE_ACTION_BOOL ("session-cookies-only", ACTION_SESSION_COOKIES_ONLY) DEFINE_ACTION_STRING ("set-image-blocker", ACTION_IMAGE_BLOCKER, ACTION_STRING_IMAGE_BLOCKER) DEFINE_CGI_PARAM_RADIO ("set-image-blocker", ACTION_IMAGE_BLOCKER, ACTION_STRING_IMAGE_BLOCKER, "pattern", 1) DEFINE_CGI_PARAM_RADIO ("set-image-blocker", ACTION_IMAGE_BLOCKER, ACTION_STRING_IMAGE_BLOCKER, "blank", 0) @@ -125,7 +125,7 @@ DEFINE_CGI_PARAM_CUSTOM ("set-image-blocker", ACTION_IMAGE_BLOCKER, * Alternative spellings */ DEFINE_ACTION_STRING ("hide-referer", ACTION_HIDE_REFERER, ACTION_STRING_REFERER) -DEFINE_ACTION_BOOL ("prevent-keeping-cookies", ACTION_NO_COOKIE_KEEP) +DEFINE_ACTION_BOOL ("prevent-keeping-cookies", ACTION_SESSION_COOKIES_ONLY) /* * Pre-3.0.7 (pseudo) compatibility @@ -145,7 +145,7 @@ DEFINE_ACTION_STRING ("hide-from", ACTION_HIDE_FROM, ACT DEFINE_ACTION_BOOL ("image", ACTION_IMAGE) DEFINE_ACTION_STRING ("image-blocker", ACTION_IMAGE_BLOCKER, ACTION_STRING_IMAGE_BLOCKER) DEFINE_ACTION_BOOL ("no-compression", ACTION_NO_COMPRESSION) -DEFINE_ACTION_BOOL ("no-cookies-keep", ACTION_NO_COOKIE_KEEP) +DEFINE_ACTION_BOOL ("no-cookies-keep", ACTION_SESSION_COOKIES_ONLY) DEFINE_ACTION_BOOL ("no-cookies-read", ACTION_CRUNCH_OUTGOING_COOKIES) DEFINE_ACTION_BOOL ("no-cookies-set", ACTION_CRUNCH_INCOMING_COOKIES) #endif /* if DEFINE_ACTION_ALIAS */ diff --git a/parsers.c b/parsers.c index 747589a9..5489288e 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,4 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.254 2012/10/17 18:18:54 fabiankeil Exp $"; +const char parsers_rcs[] = "$Id: parsers.c,v 1.255 2012/10/17 18:19:29 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -3822,7 +3822,7 @@ static jb_err server_set_cookie(struct client_state *csp, char **header) log_error(LOG_LEVEL_HEADER, "Crunching incoming cookie: %s", *header); freez(*header); } - else if ((csp->action->flags & ACTION_NO_COOKIE_KEEP) != 0) + else if ((csp->action->flags & ACTION_SESSION_COOKIES_ONLY) != 0) { /* Flag whether or not to log a message */ int changed = 0; diff --git a/project.h b/project.h index 3d660f61..a8fc9258 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.180 2012/10/17 18:18:54 fabiankeil Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 1.181 2012/10/17 18:19:29 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ @@ -476,7 +476,7 @@ struct iob /** Action bitmap: Prevent compression. */ #define ACTION_NO_COMPRESSION 0x00000400UL /** Action bitmap: Change cookies to session only cookies. */ -#define ACTION_NO_COOKIE_KEEP 0x00000800UL +#define ACTION_SESSION_COOKIES_ONLY 0x00000800UL /** Action bitmap: Block cookies coming from the client. */ #define ACTION_CRUNCH_OUTGOING_COOKIES 0x00001000UL /** Action bitmap: Block cookies coming from the server. */ -- 2.39.2