r2191 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-30 11:43:32 +0100 (Tue, 30 Oct 2007)
New Revision: 2191

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

........
  r2181 | phk | 2007-10-29 10:16:13 +0100 (Mon, 29 Oct 2007) | 5 lines
  
  Remember to reset te bereq's workspace after use.
  
  NB: This should be merged back to 1.1
........



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,1888-1889,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,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173
   + /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-1889,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,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181

Modified: branches/1.1/bin/varnishd/cache_backend.c
===================================================================
--- branches/1.1/bin/varnishd/cache_backend.c	2007-10-29 12:22:38 UTC (rev 2190)
+++ branches/1.1/bin/varnishd/cache_backend.c	2007-10-30 10:43:32 UTC (rev 2191)
@@ -95,6 +95,7 @@
 {
 
 	CHECK_OBJ_NOTNULL(bereq, BEREQ_MAGIC);
+	WS_Reset(bereq->ws, NULL);
 	LOCK(&vbemtx);
 	VTAILQ_INSERT_HEAD(&bereq_head, bereq, list);
 	UNLOCK(&vbemtx);