r2165 - in branches/1.2: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-23 14:42:10 +0200 (Tue, 23 Oct 2007)
New Revision: 2165

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

........
  r2153 | des | 2007-10-19 15:58:12 +0200 (Fri, 19 Oct 2007) | 3 lines
  
  Don't assert that close() returns 0, it won't when the remote end closes
  the connection first.  This fixes #168.
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2154,2157,2161-2162
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162

Modified: branches/1.2/bin/varnishd/mgt_cli.c
===================================================================
--- branches/1.2/bin/varnishd/mgt_cli.c	2007-10-23 12:41:23 UTC (rev 2164)
+++ branches/1.2/bin/varnishd/mgt_cli.c	2007-10-23 12:42:10 UTC (rev 2165)
@@ -346,10 +346,10 @@
 cli_close:
 	vsb_delete(cp->cli->sb);
 	free(cp->buf);
-	AZ(close(cp->fdi));
+	(void)close(cp->fdi);
 	if (cp->fdi == 0)
 		assert(open("/dev/null", O_RDONLY) == 0);
-	AZ(close(cp->fdo));
+	(void)close(cp->fdo);
 	if (cp->fdo == 1) {
 		assert(open("/dev/null", O_WRONLY) == 1);
 		close(2);