Skip to content

V
varnish-cache
Commit ae99e82d authored by Dag Haavi Finstad's avatar Dag Haavi Finstad Committed by Poul-Henning Kamp
Browse files
Options

Initialize ESIs from the correct header set 

Ensure ESI children are set up from preq->http0
parent 19e37f8e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
bin/varnishd/cache/cache_esi_deliver.c
View file @ ae99e82d
......@@ -141,7 +141,7 @@ ved_include(struct req *preq, const char *src, const char *host,
req->top = preq->top;
HTTP_Setup(req->http, req->ws, req->vsl, SLT_ReqMethod);
HTTP_Copy(req->http, preq->http);
HTTP_Copy(req->http, preq->http0);
http_SetH(req->http, HTTP_HDR_URL, src);
if (host != NULL && *host != '\0') {
......
bin/varnishtest/tests/e00003.vtc
View file @ ae99e82d
......@@ -3,6 +3,7 @@ varnishtest "ESI include"
server s1 {
rxreq
expect req.http.esi0 == "foo"
txresp -body {
<html>
Before include
......@@ -12,6 +13,7 @@ server s1 {
}
rxreq
expect req.url == "/body1"
expect req.http.esi0 != "foo"
txresp -body {
Included file
}
......@@ -21,6 +23,8 @@ varnish v1 -vcl+backend {
sub vcl_recv {
if (req.esi_level > 0) {
set req.url = req.url + req.esi_level;
} else {
set req.http.esi0 = "foo";
}
}
sub vcl_backend_response {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment