Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make std.collect() also work for resp.http and bereq.http.

Fixes: #1222
  • Loading branch information...
commit 6a9302c986762616288b612f261aa2d066bdc57c 1 parent 4e1fbb6
@daghf daghf authored Tollef Fog Heen committed
Showing with 26 additions and 1 deletion.
  1. +16 −0 bin/varnishtest/tests/m00006.vtc
  2. +10 −1 lib/libvmod_std/vmod_std.c
View
16 bin/varnishtest/tests/m00006.vtc
@@ -6,6 +6,10 @@ server s1 {
expect req.http.foo == "1, 2"
txresp -hdr "bar: a" -hdr "bar: b" -bodylen 1
+ rxreq
+ expect req.url == "/2"
+ expect req.http.baz == "1, 2"
+ txresp -hdr "qux: a" -hdr "qux: b" -bodylen 1
} -start
varnish v1 -vcl+backend {
@@ -14,9 +18,15 @@ varnish v1 -vcl+backend {
sub vcl_recv {
std.collect(req.http.foo);
}
+ sub vcl_miss {
+ std.collect(bereq.http.baz);
+ }
sub vcl_fetch {
std.collect(beresp.http.bar);
}
+ sub vcl_deliver {
+ std.collect(resp.http.qux);
+ }
} -start
client c1 {
@@ -25,6 +35,12 @@ client c1 {
expect resp.http.bar == "a, b"
expect resp.status == 200
expect resp.bodylen == 1
+
+ txreq -url "/2" -hdr "Baz: 1" -hdr "Baz: 2"
+ rxresp
+ expect resp.http.qux == "a, b"
+ expect resp.status == 200
+ expect resp.bodylen == 1
} -run
varnish v1 -errvcl {'beresp.http.bar': Not available in method 'vcl_recv'} {
View
11 lib/libvmod_std/vmod_std.c
@@ -175,6 +175,15 @@ vmod_collect(struct req *req, const struct gethdr_s *hdr)
CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
if (hdr->where == HDR_REQ)
http_CollectHdr(req->http, hdr->what);
- else if (hdr->where == HDR_BERESP && req->busyobj != NULL)
+ else if (hdr->where == HDR_BEREQ) {
+ AN(req->busyobj);
+ http_CollectHdr(req->busyobj->bereq, hdr->what);
+ }
+ else if (hdr->where == HDR_BERESP) {
+ AN(req->busyobj);
http_CollectHdr(req->busyobj->beresp, hdr->what);
+ }
+ else if (hdr->where == HDR_RESP) {
+ http_CollectHdr(req->resp, hdr->what);
+ }
}
Please sign in to comment.
Something went wrong with that request. Please try again.