[master] a221996 Connection: is now firmly a HTTP1 thing.
Poul-Henning Kamp
phk at FreeBSD.org
Thu Nov 13 11:13:15 CET 2014
commit a2219961b7c137a1f3248a7195fe699f70eab9f8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Nov 13 10:12:52 2014 +0000
Connection: is now firmly a HTTP1 thing.
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index d328872..040f50d 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -592,8 +592,6 @@ cnt_recv(struct worker *wrk, struct req *req)
}
}
- req->doclose = http_DoConnection(req->http);
-
/* By default we use the first backend */
AZ(req->director_hint);
req->director_hint = req->vcl->director[0];
diff --git a/bin/varnishd/http1/cache_http1_fsm.c b/bin/varnishd/http1/cache_http1_fsm.c
index 1737e65..a7ca699 100644
--- a/bin/varnishd/http1/cache_http1_fsm.c
+++ b/bin/varnishd/http1/cache_http1_fsm.c
@@ -303,6 +303,8 @@ http1_dissect(struct worker *wrk, struct req *req)
AZ(req->err_code);
req->ws_req = WS_Snapshot(req->ws);
+ req->doclose = http_DoConnection(req->http);
+
assert(req->req_body_status != REQ_BODY_INIT);
HTTP_Copy(req->http0, req->http); // For ESI & restart
More information about the varnish-commit
mailing list