r2002 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-09-23 16:36:05 +0200 (Sun, 23 Sep 2007)
New Revision: 2002

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

........
  r1991 | phk | 2007-09-23 15:11:51 +0200 (Sun, 23 Sep 2007) | 4 lines
  
  When a workerthread dies of old age, make sure to nuke the mutex it may
  have in its cached nobjhead.
........



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,1886,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1984,1986-1989,1992-1998
   + /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,1955,1957-1958,1967-1968,1970-1974,1984,1986-1989,1991-1998

Modified: branches/1.1/bin/varnishd/cache_pool.c
===================================================================
--- branches/1.1/bin/varnishd/cache_pool.c	2007-09-23 14:26:59 UTC (rev 2001)
+++ branches/1.1/bin/varnishd/cache_pool.c	2007-09-23 14:36:05 UTC (rev 2002)
@@ -258,8 +258,10 @@
 	close(w->pipe[1]);
 	if (w->srcaddr != NULL)
 		free(w->srcaddr);
-	if (w->nobjhead != NULL)
+	if (w->nobjhead != NULL) {
+		MTX_DESTROY(&w->nobjhead->mtx);
 		free(w->nobjhead);
+	}
 	if (w->nobj!= NULL)
 		free(w->nobj);
 	return (NULL);