[master] 83c03a8 Single test for Range-qualifying request

Poul-Henning Kamp phk at varnish-cache.org
Fri Sep 6 23:50:45 CEST 2013


commit 83c03a89fe6e4c3e591d1bd8cff65a7d8def2f0a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Sep 6 17:36:51 2013 +0000

    Single test for Range-qualifying request

diff --git a/bin/varnishd/cache/cache_http1_deliver.c b/bin/varnishd/cache/cache_http1_deliver.c
index 39b70eb..04dab9d 100644
--- a/bin/varnishd/cache/cache_http1_deliver.c
+++ b/bin/varnishd/cache/cache_http1_deliver.c
@@ -202,8 +202,6 @@ V1D_Deliver(struct req *req)
 			http_PrintfHeader(req->resp,
 			    "Content-Length: %zd", req->obj->len);
 		}
-		if (cache_param->http_range_support)
-			http_SetHeader(req->resp, "Accept-Ranges: bytes");
 	}
 
 	if (req->esi_level > 0) {
@@ -255,9 +253,11 @@ V1D_Deliver(struct req *req)
 	    req->wantbody &&
 	    !(req->res_mode & (RES_ESI|RES_ESI_CHILD)) &&
 	    cache_param->http_range_support &&
-	    req->obj->response == 200 &&
-	    http_GetHdr(req->http, H_Range, &r))
-		v1d_dorange(req, r);
+	    req->obj->response == 200) {
+		http_SetHeader(req->resp, "Accept-Ranges: bytes");
+		if (http_GetHdr(req->http, H_Range, &r))
+			v1d_dorange(req, r);
+	}
 
 	WRW_Reserve(req->wrk, &req->sp->fd, req->vsl, req->t_resp);
 



More information about the varnish-commit mailing list