r3712 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-09 14:22:00 +0100 (Mon, 09 Feb 2009)
New Revision: 3712

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



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_ban.c	2009-02-09 13:18:50 UTC (rev 3711)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_ban.c	2009-02-09 13:22:00 UTC (rev 3712)
@@ -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: branches/2.0/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_hash.c	2009-02-09 13:18:50 UTC (rev 3711)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_hash.c	2009-02-09 13:22:00 UTC (rev 3712)
@@ -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;