]> err.no Git - varnish/commit
Merge r3433:
authortfheen <tfheen@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Mon, 19 Jan 2009 12:52:30 +0000 (12:52 +0000)
committertfheen <tfheen@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Mon, 19 Jan 2009 12:52:30 +0000 (12:52 +0000)
commita93701bb1f71849eed5d6e1f6b4eaf8be351e784
tree7b082935f687b6d12894ef98b371c4ade1c34786
parentd89932ed6db33f3cfd02dea04ad1c3f0a5ebe1fa
Merge r3433:

When we receive an If-Modified-Since on an ESI object, do not process the
conditional for the child object and pretend to send a 304 reply for them, if
we have decided to deliver the main object.

Fixes #386

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/branches/2.0@3528 d4fa192b-c00b-0410-8231-f00ffab90ce4
varnish-cache/bin/varnishd/cache_vrt_esi.c
varnish-cache/bin/varnishtest/tests/r00386.vtc [new file with mode: 0644]