r2299 - in branches/1.1: . bin/varnishd

des at projects.linpro.no des at projects.linpro.no
Tue Dec 18 17:55:32 CET 2007


Author: des
Date: 2007-12-18 17:55:32 +0100 (Tue, 18 Dec 2007)
New Revision: 2299

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

........
  r2275 | phk | 2007-11-20 18:20:47 +0100 (Tue, 20 Nov 2007) | 3 lines
  
  Reset the objects length to zero after we zapped all its component
  parts, otherwise we will get trouble (#167 ?) later.
........



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,2181,2206,2211-2212,2215-2220,2222-2232,2243,2270-2271
   + /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,2206,2211-2212,2215-2220,2222-2232,2243,2270-2271,2275

Modified: branches/1.1/bin/varnishd/cache_fetch.c
===================================================================
--- branches/1.1/bin/varnishd/cache_fetch.c	2007-12-18 16:50:26 UTC (rev 2298)
+++ branches/1.1/bin/varnishd/cache_fetch.c	2007-12-18 16:55:32 UTC (rev 2299)
@@ -365,6 +365,7 @@
 			STV_free(st);
 		}
 		VBE_ClosedFd(sp->wrk, vc);
+		sp->obj->len = 0;
 		return (-1);
 	}
 




More information about the varnish-commit mailing list