[master] 1b4a6b5 Spot and handle 3-digit status from backend, where the first digit is zero.

[Poul-Henning Kamp]

commit 1b4a6b5ed8bf3389b4d920dc54579c754f475f36
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Oct 2 09:28:37 2013 +0000

    Spot and handle 3-digit status from backend, where the first digit is zero.
    
    Fixes:	#1337

diff --git a/bin/varnishd/cache/cache_http1_proto.c b/bin/varnishd/cache/cache_http1_proto.c
index d59c384..d03a437 100644
--- a/bin/varnishd/cache/cache_http1_proto.c
+++ b/bin/varnishd/cache/cache_http1_proto.c
@@ -461,7 +461,6 @@ HTTP1_DissectRequest(struct req *req)
 uint16_t
 HTTP1_DissectResponse(struct http *hp, const struct http_conn *htc)
 {
-	int j;
 	uint16_t retval = 0;
 	char *p;
 
@@ -481,16 +480,22 @@ HTTP1_DissectResponse(struct http *hp, const struct http_conn *htc)
 	if (retval == 0) {
 		hp->status = 0;
 		p = hp->hd[HTTP_HDR_STATUS].b;
-		for (j = 100; j != 0; j /= 10) {
-			if (!vct_isdigit(*p)) {
-				retval = 503;
-				break;
-			}
-			hp->status += (uint16_t)(j * (*p - '0'));
-			p++;
-		}
-		if (*p != '\0')
+
+		if (p[0] < '1' || p[0] > '9')
+			retval = 503;
+		else
+			hp->status += 100 * (p[0] - '0');
+
+		if (p[1] < '0' || p[1] > '9')
+			retval = 503;
+		else
+			hp->status += 10 * (p[1] - '0');
+
+		if (p[2] < '0' || p[2] > '9')
 			retval = 503;
+		else
+			hp->status += (p[2] - '0');
+		assert(hp->status <= 999);
 	}
 
 	if (retval != 0) {
diff --git a/bin/varnishtest/tests/r01337.vtc b/bin/varnishtest/tests/r01337.vtc
new file mode 100644
index 0000000..d954347
--- /dev/null
+++ b/bin/varnishtest/tests/r01337.vtc
@@ -0,0 +1,22 @@
+varnishtest "Bogus backend status"
+
+server s1 {
+	rxreq
+	expect req.url == /low
+	txresp -status 099
+	accept
+	rxreq
+	expect req.url == /high
+	txresp -status 1000
+} -start
+
+varnish v1 -vcl+backend {} -start
+
+client c1 {
+	txreq -url /low
+	rxresp
+	expect resp.status == 503
+	txreq -url /high
+	rxresp
+	expect resp.status == 503
+} -run