Merged revisions 2285-2286 via svnmerge from

svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2285 | phk | 2007-11-23 11:47:16 +0100 (Fri, 23 Nov 2007) | 5 lines
  
  Also accept the undocumented ENOTCONN error return from close(2).
  
  See also http://www.version2.dk/artikel/5153 if you read danish.
........
  r2286 | phk | 2007-12-07 13:03:58 +0100 (Fri, 07 Dec 2007) | 5 lines
  
  TCP connections don't quite behave like other fds, and we need to handle
  that for the managers CLI event-engine:
  
  React to POLLNVAL as we would to POLLHUP
........


git-svn-id: http://www.varnish-cache.org/svn/branches/1.1@2307 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/mgt_cli.c

@@ -299,7 +299,7 @@ mgt_cli_callback(struct ev *e, int what)
 
 	CAST_OBJ_NOTNULL(cp, e->priv, CLI_PORT_MAGIC);
 
-	if (what & (EV_ERR | EV_HUP))
+	if (what & (EV_ERR | EV_HUP | EV_GONE))
 		goto cli_close;
 
 	/* grow the buffer if it is full */

bin/varnishd/mgt_event.h

@@ -49,6 +49,7 @@ struct ev {
 #define		EV_WR	POLLOUT
 #define		EV_ERR	POLLERR
 #define		EV_HUP	POLLHUP
+#define		EV_GONE	POLLNVAL
 #define		EV_SIG	-1
 	int		sig;
 	unsigned	sig_flags;