[master] e316a5f Remove dodgy workaround introduced for #763.

Martin Blix Grydeland martin at varnish-cache.org
Tue Mar 19 15:43:19 CET 2013


commit e316a5fb72d67f3f3e64e4d73a9a423bf74c88ae
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Mon Mar 18 17:11:34 2013 +0100

    Remove dodgy workaround introduced for #763.
    
    With fix for #1275 we can now do a proper 503 when malformed
    Vary-headers are received from backend. Error out instead of accepting
    bogus ':'.

diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index f35b2ae..3a99bf3 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -93,11 +93,6 @@ VRY_Create(struct req *req, const struct http *hp, struct vsb **psb)
 	sbh = VSB_new_auto();
 	AN(sbh);
 
-	if (*v == ':') {
-		VSLb(req->vsl, SLT_Error,
-		    "Vary header had extra ':', fix backend");
-		v++;
-	}
 	for (p = v; *p; p++) {
 
 		/* Find next header-name */
diff --git a/bin/varnishtest/tests/r00763.vtc b/bin/varnishtest/tests/r00763.vtc
index 24a4d6f..72fced4 100644
--- a/bin/varnishtest/tests/r00763.vtc
+++ b/bin/varnishtest/tests/r00763.vtc
@@ -10,5 +10,5 @@ varnish v1 -vcl+backend {} -start
 client c1 {
 	txreq
 	rxresp
-	expect resp.http.vary == ": foo"
+	expect resp.status == 503
 } -run



More information about the varnish-commit mailing list