r1954 - in branches/1.1: . bin/varnishd

des at projects.linpro.no des at projects.linpro.no
Wed Sep 12 18:24:09 CEST 2007


Author: des
Date: 2007-09-12 18:24:09 +0200 (Wed, 12 Sep 2007)
New Revision: 1954

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

........
  r1942 | phk | 2007-09-12 08:12:18 +0200 (Wed, 12 Sep 2007) | 7 lines
  
  Make sure to initialize t_end if we drop sessions.
  
  Fixes #132
  
  Many thanks to Janis Putrams for debugging this.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-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,1943-1949
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-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

Modified: branches/1.1/bin/varnishd/cache_pool.c
===================================================================
--- branches/1.1/bin/varnishd/cache_pool.c	2007-09-12 16:21:17 UTC (rev 1953)
+++ branches/1.1/bin/varnishd/cache_pool.c	2007-09-12 16:24:09 UTC (rev 1954)
@@ -310,6 +310,7 @@
 	    (params->wthread_max * params->overflow_max) / 100)) {
 		VSL_stats->n_wrk_drop++;
 		UNLOCK(&tmtx);
+		sp->t_end = TIM_real();
 		vca_close_session(sp, "dropped");
 		vca_return_session(sp);
 		return;




More information about the varnish-commit mailing list