r4695 - in branches/2.1: . varnish-cache/bin/varnishd varnish-cache/bin/varnishtest/tests varnish-cache/include varnish-cache/lib/libvarnish varnish-cache/lib/libvcl
tfheen at varnish-cache.org
tfheen at varnish-cache.org
Mon Apr 19 15:03:14 CEST 2010
Author: tfheen
Date: 2010-04-19 15:03:14 +0200 (Mon, 19 Apr 2010)
New Revision: 4695
Modified:
branches/2.1/
branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
branches/2.1/varnish-cache/bin/varnishd/cache_vrt.c
branches/2.1/varnish-cache/bin/varnishd/hash_slinger.h
branches/2.1/varnish-cache/bin/varnishd/vparam.h
branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
branches/2.1/varnish-cache/include/vct.h
branches/2.1/varnish-cache/include/vev.h
branches/2.1/varnish-cache/include/vrt.h
branches/2.1/varnish-cache/lib/libvarnish/tcp.c
branches/2.1/varnish-cache/lib/libvarnish/vev.c
branches/2.1/varnish-cache/lib/libvcl/vcc_action.c
branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
branches/2.1/varnish-cache/lib/libvcl/vcc_fixed_token.c
Log:
Merge r4667: Carry out a bit of internal renaming, and recognize that
it was a really bad idea to call "bans" for "purges" some places.
Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:4637,4640,4643-4645,4647-4650,4654-4666
+ /trunk:4637,4640,4643-4645,4647-4650,4654-4667
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4667
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4667
Modified: branches/2.1/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- branches/2.1/varnish-cache/bin/varnishd/cache_vrt.c 2010-04-19 12:49:33 UTC (rev 4694)
+++ branches/2.1/varnish-cache/bin/varnishd/cache_vrt.c 2010-04-19 13:03:14 UTC (rev 4695)
@@ -937,7 +937,7 @@
/*--------------------------------------------------------------------*/
void
-VRT_purge(struct sess *sp, char *cmds, ...)
+VRT_ban(struct sess *sp, char *cmds, ...)
{
char *a1, *a2, *a3;
va_list ap;
@@ -972,7 +972,7 @@
/*--------------------------------------------------------------------*/
void
-VRT_purge_string(struct sess *sp, const char *str, ...)
+VRT_ban_string(struct sess *sp, const char *str, ...)
{
char *p, *a1, *a2, *a3;
char **av;
Modified: branches/2.1/varnish-cache/bin/varnishd/hash_slinger.h
===================================================================
--- branches/2.1/varnish-cache/bin/varnishd/hash_slinger.h 2010-04-19 12:49:33 UTC (rev 4694)
+++ branches/2.1/varnish-cache/bin/varnishd/hash_slinger.h 2010-04-19 13:03:14 UTC (rev 4695)
@@ -64,6 +64,7 @@
void HSH_DerefObjCore(struct sess *sp);
void HSH_FindBan(struct sess *sp, struct objcore **oc);
struct objcore *HSH_Insert(const struct sess *sp);
+void HSH_Purge(struct sess *, struct objhead *, double ttl, double grace);
#ifdef VARNISH_CACHE_CHILD
Property changes on: branches/2.1/varnish-cache/bin/varnishd/vparam.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4667
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4667
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4667
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4667
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4667
Property changes on: branches/2.1/varnish-cache/include/vct.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4667
Property changes on: branches/2.1/varnish-cache/include/vev.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4667
Modified: branches/2.1/varnish-cache/include/vrt.h
===================================================================
--- branches/2.1/varnish-cache/include/vrt.h 2010-04-19 12:49:33 UTC (rev 4694)
+++ branches/2.1/varnish-cache/include/vrt.h 2010-04-19 13:03:14 UTC (rev 4695)
@@ -136,8 +136,8 @@
void *, const char *);
void VRT_panic(struct sess *sp, const char *, ...);
-void VRT_purge(struct sess *sp, char *, ...);
-void VRT_purge_string(struct sess *sp, const char *, ...);
+void VRT_ban(struct sess *sp, char *, ...);
+void VRT_ban_string(struct sess *sp, const char *, ...);
void VRT_count(const struct sess *, unsigned);
int VRT_rewrite(const char *, const char *);
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4667
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/vev.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4667
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_action.c 2010-04-19 12:49:33 UTC (rev 4694)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_action.c 2010-04-19 13:03:14 UTC (rev 4695)
@@ -325,7 +325,7 @@
vcc_NextToken(tl);
if (tl->t->tok == VAR) {
- Fb(tl, 1, "VRT_purge(sp,\n");
+ Fb(tl, 1, "VRT_ban(sp,\n");
tl->indent += INDENT;
while (1) {
ExpectErr(tl, VAR);
@@ -379,7 +379,7 @@
Fb(tl, 1, "0);\n");
tl->indent -= INDENT;
} else {
- Fb(tl, 1, "VRT_purge_string(sp, ");
+ Fb(tl, 1, "VRT_ban_string(sp, ");
if (!vcc_StringVal(tl)) {
vcc_ExpectedStringval(tl);
return;
@@ -404,7 +404,7 @@
Expect(tl, '(');
vcc_NextToken(tl);
- Fb(tl, 1, "VRT_purge(sp, \"req.url\", \"~\", ");
+ Fb(tl, 1, "VRT_ban(sp, \"req.url\", \"~\", ");
if (!vcc_StringVal(tl)) {
vcc_ExpectedStringval(tl);
return;
Property changes on: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4666
+ /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4667
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_fixed_token.c 2010-04-19 12:49:33 UTC (rev 4694)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_fixed_token.c 2010-04-19 13:03:14 UTC (rev 4695)
@@ -279,10 +279,10 @@
vsb_cat(sb, "const char *VRT_regsub(const struct sess *sp, int all,");
vsb_cat(sb, " const char *,\n void *, const char *);\n");
vsb_cat(sb, "\nvoid VRT_panic(struct sess *sp, const char *, ...);\n");
- vsb_cat(sb, "void VRT_purge(struct sess *sp, char *, ...);\n");
- vsb_cat(sb, "void VRT_purge_string(struct sess *sp, const char *, .");
- vsb_cat(sb, "..);\n\nvoid VRT_count(const struct sess *, unsigned);");
- vsb_cat(sb, "\nint VRT_rewrite(const char *, const char *);\n");
+ vsb_cat(sb, "void VRT_ban(struct sess *sp, char *, ...);\n");
+ vsb_cat(sb, "void VRT_ban_string(struct sess *sp, const char *, ...");
+ vsb_cat(sb, ");\n\nvoid VRT_count(const struct sess *, unsigned);\n");
+ vsb_cat(sb, "int VRT_rewrite(const char *, const char *);\n");
vsb_cat(sb, "void VRT_error(struct sess *, unsigned, const char *);");
vsb_cat(sb, "\nint VRT_switch_config(const char *);\n");
vsb_cat(sb, "\nenum gethdr_e { HDR_REQ, HDR_RESP, HDR_OBJ, HDR_BERE");
More information about the varnish-commit
mailing list