r2138 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-19 13:23:50 +0200 (Fri, 19 Oct 2007)
New Revision: 2138

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

........
  r1888 | phk | 2007-08-20 13:05:07 +0200 (Mon, 20 Aug 2007) | 8 lines
  
  Fix a long-standing bug in pipe-mode:  We must pass the protocol version
  across unchanged, otherwise the semantics of the Connection: header cannot
  be interpreted correctly by the server.
  
  wget(1) could trigger this problem and would have to wait for the server
  to close the (seemingly idle) connection before continuing.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2032-2033,2133
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2032-2033,2133

Modified: branches/1.1/bin/varnishd/cache_http.c
===================================================================
--- branches/1.1/bin/varnishd/cache_http.c	2007-10-19 11:21:06 UTC (rev 2137)
+++ branches/1.1/bin/varnishd/cache_http.c	2007-10-19 11:23:50 UTC (rev 2138)
@@ -715,17 +715,20 @@
 }
 
 static void
-http_copyreq(struct http *to, struct http *fm, int forceget)
+http_copyreq(struct http *to, struct http *fm, int transparent)
 {
 
 	CHECK_OBJ_NOTNULL(fm, HTTP_MAGIC);
 	CHECK_OBJ_NOTNULL(to, HTTP_MAGIC);
-	if (forceget)
+	if (transparent)
+		http_copyh(to, fm, HTTP_HDR_REQ);
+	else
 		http_SetH(to, HTTP_HDR_REQ, "GET");
+	http_copyh(to, fm, HTTP_HDR_URL);
+	if (transparent)
+		http_copyh(to, fm, HTTP_HDR_PROTO);
 	else
-		http_copyh(to, fm, HTTP_HDR_REQ);
-	http_copyh(to, fm, HTTP_HDR_URL);
-	http_SetH(to, HTTP_HDR_PROTO, "HTTP/1.1");
+		http_SetH(to, HTTP_HDR_PROTO, "HTTP/1.1");
 }
 
 void