r4357 - in trunk/varnish-cache: bin/varnishtest/tests lib/libvcl

[phk at projects.linpro.no]

Author: phk
Date: 2009-11-19 13:00:12 +0100 (Thu, 19 Nov 2009)
New Revision: 4357

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc
   trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc
   trunk/varnish-cache/lib/libvcl/vcc_backend.c
Log:
.expected_response is a better idea than .status

Tip o' the hat to: tfheen



Modified: trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc	2009-11-19 11:40:23 UTC (rev 4356)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00002.vtc	2009-11-19 12:00:12 UTC (rev 4357)
@@ -189,7 +189,7 @@
 varnish v1 -badvcl {
 	backend b1 {
 		.host = "127.0.0.1";
-		.probe = { .status = 13; }
+		.probe = { .expected_response = 13; }
 	}
 }
 

Modified: trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc	2009-11-19 11:40:23 UTC (rev 4356)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00005.vtc	2009-11-19 12:00:12 UTC (rev 4357)
@@ -7,7 +7,7 @@
 	backend b1 {
 		.host = "127.0.0.1";
 		.probe = {
-			.status = 204;
+			.expected_response = 204;
 		}
 	}
 }

Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-11-19 11:40:23 UTC (rev 4356)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c	2009-11-19 12:00:12 UTC (rev 4357)
@@ -348,7 +348,7 @@
 	fs = vcc_FldSpec(tl,
 	    "?url",
 	    "?request",
-	    "?status",
+	    "?expected_response",
 	    "?timeout",
 	    "?interval",
 	    "?window",
@@ -408,7 +408,7 @@
 			initial = vcc_UintVal(tl);
 			vcc_NextToken(tl);
 			ERRCHK(tl);
-		} else if (vcc_IdIs(t_field, "status")) {
+		} else if (vcc_IdIs(t_field, "expected_response")) {
 			status = vcc_UintVal(tl);
 			if (status < 100 || status > 999) {
 				vsb_printf(tl->sb,