[master] fac6316 We never start the main request FSM with an error code.
Poul-Henning Kamp
phk at FreeBSD.org
Thu Nov 13 10:49:00 CET 2014
commit fac6316cb1cc37b5a8c75f8a51186c2f392c5800
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Nov 13 09:48:41 2014 +0000
We never start the main request FSM with an error code.
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 6b7a9db..d328872 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -566,6 +566,7 @@ cnt_recv(struct worker *wrk, struct req *req)
CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
CHECK_OBJ_NOTNULL(req->vcl, VCL_CONF_MAGIC);
AZ(req->objcore);
+ AZ(req->err_code);
AZ(isnan(req->t_first));
AZ(isnan(req->t_prev));
@@ -591,11 +592,6 @@ cnt_recv(struct worker *wrk, struct req *req)
}
}
- if (req->err_code) {
- req->req_step = R_STP_SYNTH;
- return (REQ_FSM_MORE);
- }
-
req->doclose = http_DoConnection(req->http);
/* By default we use the first backend */
More information about the varnish-commit
mailing list