Make varnishd actually work again after my last commit: Forgot to adjust

default VCL

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1644 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index a7ad1a830ca693a9273a67a162f2efa0fd37b0c7..9ceecca99d1f7ecf328cfe2667b8871f3abfc7aa 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -81,7 +81,13 @@ VRT_GetHdr(struct sess *sp, enum gethdr_e where, const char *n)
        case HDR_REQ:
                hp = sp->http;
                break;
+       case HDR_BEREQ:
+               hp = sp->bereq->http;
+               break;
        case HDR_RESP:
+               hp = sp->http;
+               break;
+       case HDR_OBJ:
                hp = &sp->obj->http;
                break;
        default:

diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index abb77c576b0d5e7a479e9a99e2682495947d381e..ab5b96632e7891cbf8410dedd69b4593d851e03b 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -122,7 +122,7 @@ static const char *default_vcl =
     "    if (!obj.cacheable) {\n"
     "        pass;\n"
     "    }\n"
-    "    if (resp.http.Set-Cookie) {\n"
+    "    if (obj.http.Set-Cookie) {\n"
     "        pass;\n"
     "    }\n"
     "    insert;\n"