r2152 - in branches/1.2: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-19 15:49:43 +0200 (Fri, 19 Oct 2007)
New Revision: 2152

Modified:
   branches/1.2/
   branches/1.2/bin/varnishd/cache_http.c
Log:
Merged revisions 2151 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2151 | des | 2007-10-19 15:49:27 +0200 (Fri, 19 Oct 2007) | 2 lines
  
  Don't try to interpret the status code when we know the response is invalid.
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151

Modified: branches/1.2/bin/varnishd/cache_http.c
===================================================================
--- branches/1.2/bin/varnishd/cache_http.c	2007-10-19 13:49:27 UTC (rev 2151)
+++ branches/1.2/bin/varnishd/cache_http.c	2007-10-19 13:49:43 UTC (rev 2152)
@@ -503,8 +503,9 @@
 
 	if (i != 0 || memcmp(hp->hd[HTTP_HDR_PROTO].b, "HTTP/1.", 7))
 		WSLR(w, SLT_HttpGarbage, htc->fd, htc->rxbuf);
-	if (i != 0 && hp->status == 0) {
-		hp->status = i;
+	if (i != 0) {
+		if (hp->status == 0)
+			hp->status = i;
 	} else {
 		hp->status = 
 		    strtoul(hp->hd[HTTP_HDR_STATUS].b, NULL /* XXX */, 10);