r2196 - in branches/1.2: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-30 11:59:36 +0100 (Tue, 30 Oct 2007)
New Revision: 2196

Modified:
   branches/1.2/
   branches/1.2/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.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166,2175-2176,2180,2191-2192
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166,2175-2176,2180-2181,2191-2192

Modified: branches/1.2/bin/varnishd/cache_backend.c
===================================================================
--- branches/1.2/bin/varnishd/cache_backend.c	2007-10-30 10:57:41 UTC (rev 2195)
+++ branches/1.2/bin/varnishd/cache_backend.c	2007-10-30 10:59:36 UTC (rev 2196)
@@ -161,6 +161,7 @@
 {
 
 	CHECK_OBJ_NOTNULL(bereq, BEREQ_MAGIC);
+	WS_Reset(bereq->ws, NULL);
 	LOCK(&VBE_mtx);
 	VTAILQ_INSERT_HEAD(&bereq_head, bereq, list);
 	UNLOCK(&VBE_mtx);