Move the fiddling of banned objects to cache_ban.c

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@3524 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_ban.c

@@ -518,6 +518,9 @@ BAN_CheckObject(struct object *o, const struct sess *sp)
 		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);
 	}

bin/varnishd/cache_hash.c

@@ -255,12 +255,8 @@ HSH_Lookup(struct sess *sp)
 			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;