r3690 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-06 16:27:34 +0100 (Fri, 06 Feb 2009)
New Revision: 3690

Modified:
   branches/2.0/varnish-cache/bin/varnishd/mgt_vcc.c
Log:
Merge r3501+r3502: Don't panic if we fail to delete shared objects in atexit().

Fixes #376

Addendum to r3501: remove the file from the list.



Modified: branches/2.0/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/mgt_vcc.c	2009-02-06 15:10:33 UTC (rev 3689)
+++ branches/2.0/varnish-cache/bin/varnishd/mgt_vcc.c	2009-02-06 15:27:34 UTC (rev 3690)
@@ -436,7 +436,8 @@
 		vp = VTAILQ_FIRST(&vclhead);
 		if (vp == NULL)
 			break;
-		mgt_vcc_del(vp);
+		(void)unlink(vp->fname);
+		VTAILQ_REMOVE(&vclhead, vp, list);
 	}
 }