[3.0] be4891e Remove dodgy workaround introduced for #763.

Martin Blix Grydeland martin at varnish-cache.org
Tue Mar 19 16:35:49 CET 2013


commit be4891e87d918598920f49a38d0c74fa5dbd5ded
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 ':'.
    
    Conflicts:
    	bin/varnishd/cache_vary.c

diff --git a/bin/varnishd/cache_vary.c b/bin/varnishd/cache_vary.c
index a415822..ead247d 100644
--- a/bin/varnishd/cache_vary.c
+++ b/bin/varnishd/cache_vary.c
@@ -93,10 +93,6 @@ VRY_Create(const struct sess *sp, const struct http *hp, struct vsb **psb)
 	sbh = VSB_new_auto();
 	AN(sbh);
 
-	if (*v == ':') {
-		WSP(sp, 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