r2307 - in branches/1.1: . bin/varnishd

des at projects.linpro.no des at projects.linpro.no
Tue Dec 18 18:20:00 CET 2007


Author: des
Date: 2007-12-18 18:20:00 +0100 (Tue, 18 Dec 2007)
New Revision: 2307

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/mgt_cli.c
   branches/1.1/bin/varnishd/mgt_event.h
Log:
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
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2296-2301
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2296-2301

Modified: branches/1.1/bin/varnishd/mgt_cli.c
===================================================================
--- branches/1.1/bin/varnishd/mgt_cli.c	2007-12-18 17:19:46 UTC (rev 2306)
+++ branches/1.1/bin/varnishd/mgt_cli.c	2007-12-18 17:20:00 UTC (rev 2307)
@@ -299,7 +299,7 @@
 
 	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 */

Modified: branches/1.1/bin/varnishd/mgt_event.h
===================================================================
--- branches/1.1/bin/varnishd/mgt_event.h	2007-12-18 17:19:46 UTC (rev 2306)
+++ branches/1.1/bin/varnishd/mgt_event.h	2007-12-18 17:20:00 UTC (rev 2307)
@@ -49,6 +49,7 @@
 #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;




More information about the varnish-commit mailing list