r2143 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-10-19 13:35:48 +0200 (Fri, 19 Oct 2007)
New Revision: 2143

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

........
  r2088 | phk | 2007-10-08 13:28:11 +0200 (Mon, 08 Oct 2007) | 2 lines
  
  Add an assert for spotting ticket #162
........



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,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,2078-2079,2133
   + /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,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,2078-2079,2088,2133

Modified: branches/1.1/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- branches/1.1/bin/varnishd/cache_acceptor_kqueue.c	2007-10-19 11:33:23 UTC (rev 2142)
+++ branches/1.1/bin/varnishd/cache_acceptor_kqueue.c	2007-10-19 11:35:48 UTC (rev 2143)
@@ -88,6 +88,7 @@
 		while (i >= sizeof ss[0]) {
 			CHECK_OBJ_NOTNULL(ss[j], SESS_MAGIC);
 			assert(ss[j]->fd >= 0);
+			AZ(ss[j]->obj);
 			VTAILQ_INSERT_TAIL(&sesshead, ss[j], list);
 			vca_kq_sess(ss[j], EV_ADD);
 			j++;