[master] c62d0b6 Don't keep looking at req->obj->http once we have req->resp populated.

Poul-Henning Kamp phk at FreeBSD.org
Thu Aug 7 09:23:18 CEST 2014


commit c62d0b6b324a3fbb5a098932b226e4a6fd70240e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Aug 7 07:22:56 2014 +0000

    Don't keep looking at req->obj->http once we have req->resp populated.

diff --git a/bin/varnishd/cache/cache_http1_deliver.c b/bin/varnishd/cache/cache_http1_deliver.c
index 83eb73d..743816b 100644
--- a/bin/varnishd/cache/cache_http1_deliver.c
+++ b/bin/varnishd/cache/cache_http1_deliver.c
@@ -93,7 +93,7 @@ v1d_dorange(struct req *req, struct busyobj *bo, const char *r)
 
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(req->obj, OBJECT_MAGIC);
-	assert(http_GetStatus(req->obj->http) == 200);
+	assert(http_GetStatus(req->resp) == 200);
 
 	/* We must snapshot the length if we're streaming from the backend */
 	if (bo != NULL)
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index a07f12f..8997f91 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -163,7 +163,7 @@ cnt_deliver(struct worker *wrk, struct req *req)
 
 	if (!(req->objcore->flags & OC_F_PASS)
 	    && req->esi_level == 0
-	    && http_GetStatus(req->obj->http) == 200
+	    && http_GetStatus(req->resp) == 200
 	    && req->http->conds && RFC2616_Do_Cond(req)) {
 		http_PutResponse(req->resp, "HTTP/1.1", 304, NULL);
 		req->wantbody = 0;
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index 6dc75ef..154b633 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -363,7 +363,7 @@ RFC2616_Do_Cond(const struct req *req)
 	}
 
 	if (http_GetHdr(req->http, H_If_None_Match, &p) &&
-	    http_GetHdr(req->obj->http, H_ETag, &e)) {
+	    http_GetHdr(req->resp, H_ETag, &e)) {
 		if (strcmp(p,e) != 0)
 			return (0);
 		do_cond = 1;



More information about the varnish-commit mailing list