r1993 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-09-23 15:16:17 +0200 (Sun, 23 Sep 2007)
New Revision: 1993

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

........
  r1886 | phk | 2007-08-20 12:52:59 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  polish
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-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

Modified: branches/1.1/bin/varnishd/cache_fetch.c
===================================================================
--- branches/1.1/bin/varnishd/cache_fetch.c	2007-09-23 13:15:03 UTC (rev 1992)
+++ branches/1.1/bin/varnishd/cache_fetch.c	2007-09-23 13:16:17 UTC (rev 1993)
@@ -345,8 +345,7 @@
 			TAILQ_REMOVE(&sp->obj->store, st, list);
 			STV_free(st);
 		}
-		close(vc->fd);
-		VBE_ClosedFd(sp->wrk, vc, 1);
+		VBE_ClosedFd(sp->wrk, vc, 0);
 		return (-1);
 	}