[master] d11b853 Shave another couple of lines out of cnt_start{}

[Poul-Henning Kamp]

commit d11b853126d1be95a8bf7412975753c6bd4bde49
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 7 09:38:57 2012 +0000

    Shave another couple of lines out of cnt_start{}

diff --git a/bin/varnishd/cache/cache_http1_fsm.c b/bin/varnishd/cache/cache_http1_fsm.c
index e8c26ca..0cee630 100644
--- a/bin/varnishd/cache/cache_http1_fsm.c
+++ b/bin/varnishd/cache/cache_http1_fsm.c
@@ -264,6 +264,9 @@ http1_dissect(struct worker *wrk, struct req *req)
 		return (1);
 	}
 
+	wrk->stats.client_req++;
+	req->acct_req.req++;
+
 	req->ws_req = WS_Snapshot(req->ws);
 	req->doclose = http_DoConnection(req->http);
 
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 63ba22c..b809c6d 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -1110,6 +1110,8 @@ cnt_recv(const struct worker *wrk, struct req *req)
 	req->director = req->vcl->director[0];
 	AN(req->director);
 
+	EXP_Clr(&req->exp);
+
 	req->disable_esi = 0;
 	req->hash_always_miss = 0;
 	req->hash_ignore_busy = 0;
@@ -1190,17 +1192,11 @@ cnt_start(struct worker *wrk, struct req *req)
 	AZ(req->esi_level);
 	assert(!isnan(req->t_req));
 
-	/* Update stats of various sorts */
-	wrk->stats.client_req++;
-	req->acct_req.req++;
-
 	/* Assign XID and log */
 	req->xid = ++xids;				/* XXX not locked */
 	VSLb(req->vsl, SLT_ReqStart, "%s %s %u",
 	    req->sp->addr, req->sp->port, req->xid);
 
-	EXP_Clr(&req->exp);
-
 	if (req->err_code)
 		req->req_step = R_STP_ERROR;
 	else