r2142 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

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

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

........
  r2079 | phk | 2007-10-08 09:18:48 +0200 (Mon, 08 Oct 2007) | 4 lines
  
  Flush the threads shmlog before we try to make up a reponse, so that
  we know what transactions trigger problems in that code.
........



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,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,2078,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,2026,2031-2033,2078-2079,2133

Modified: branches/1.1/bin/varnishd/cache_synthetic.c
===================================================================
--- branches/1.1/bin/varnishd/cache_synthetic.c	2007-10-19 11:32:49 UTC (rev 2141)
+++ branches/1.1/bin/varnishd/cache_synthetic.c	2007-10-19 11:33:23 UTC (rev 2142)
@@ -55,6 +55,7 @@
 	double now;
 	int fd;
 
+	WSL_Flush(sp->wrk);
 	assert(status >= 100 && status <= 999);
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);