Mailing List Archive

Author: des
Date: 2007-09-23 15:09:07 +0200 (Sun, 23 Sep 2007)
New Revision: 1988

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

........
r1866 | phk | 2007-08-20 10:55:13 +0200 (Mon, 20 Aug 2007) | 2 lines

Assert that the timestats we need for VSL_StatSess are valid.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1884,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949
+ /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871,1873-1880,1884,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949

Modified: branches/1.1/bin/varnishd/cache_session.c
===================================================================
--- branches/1.1/bin/varnishd/cache_session.c 2007-09-23 13:07:54 UTC (rev 1987)
+++ branches/1.1/bin/varnishd/cache_session.c 2007-09-23 13:09:07 UTC (rev 1988)
@@ -340,6 +340,8 @@
AZ(sp->vcl);
VSL_stats->n_sess--;
ses_relsrcaddr(sp);
+ assert(!isnan(b->first));
+ assert(!isnan(sp->t_end));
VSL(SLT_StatSess, sp->id, "%s %s %.0f %ju %ju %ju %ju %ju %ju %ju",
sp->addr, sp->port, sp->t_end - b->first,
b->sess, b->req, b->pipe, b->pass,