[master] 2386b35 Allow link to parent on ESI subrequests and in -grequest mode

Martin Blix Grydeland martin at varnish-software.com
Thu Feb 27 15:21:08 CET 2014


commit 2386b3512523282ce3a42b2bad806c718897015a
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Thu Feb 27 15:18:31 2014 +0100

    Allow link to parent on ESI subrequests and in -grequest mode

diff --git a/lib/libvarnishapi/vsl_dispatch.c b/lib/libvarnishapi/vsl_dispatch.c
index 8a7f6e6..bf4bcd0 100644
--- a/lib/libvarnishapi/vsl_dispatch.c
+++ b/lib/libvarnishapi/vsl_dispatch.c
@@ -744,7 +744,8 @@ vtx_scan_begin(struct VSLQ *vslq, struct vtx *vtx, const uint32_t *ptr)
 
 	if (vslq->grouping == VSL_g_vxid)
 		return (0);	/* No links */
-	if (vslq->grouping == VSL_g_request && vtx->type == VSL_t_req)
+	if (vslq->grouping == VSL_g_request && vtx->type == VSL_t_req &&
+	    vtx->reason == VSL_r_rxreq)
 		return (0);	/* No links */
 
 	if (vtx->parent != NULL) {



More information about the varnish-commit mailing list