r3524 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-01-19 10:36:07 +0100 (Mon, 19 Jan 2009)
New Revision: 3524

Modified:
   trunk/varnish-cache/bin/varnishd/cache_ban.c
   trunk/varnish-cache/bin/varnishd/cache_hash.c
Log:
Move the fiddling of banned objects to cache_ban.c



Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-01-19 09:22:49 UTC (rev 3523)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-01-19 09:36:07 UTC (rev 3524)
@@ -518,6 +518,9 @@
 		o->ban = b0;
 		return (0);
 	} else {
+		o->ttl = 0;
+		WSP(sp, SLT_ExpBan, "%u was banned", o->xid);
+		EXP_Rearm(o);
 		o->ban = NULL;
 		return (1);
 	}

Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-01-19 09:22:49 UTC (rev 3523)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-01-19 09:36:07 UTC (rev 3524)
@@ -255,12 +255,8 @@
 			continue;
 		if (o->ttl == 0)
 			continue;
-		if (BAN_CheckObject(o, sp)) {
-			o->ttl = 0;
-			WSP(sp, SLT_ExpBan, "%u was banned", o->xid);
-			EXP_Rearm(o);
+		if (BAN_CheckObject(o, sp)) 
 			continue;
-		}
 		if (o->vary != NULL && !VRY_Match(sp, o->vary))
 			continue;