diff --git a/varnish-cs1913.patch b/varnish-cs1913.patch new file mode 100644 index 0000000..3186668 --- /dev/null +++ b/varnish-cs1913.patch @@ -0,0 +1,18 @@ +Index: bin/varnishd/cache_center.c +=================================================================== +--- bin/varnishd/cache_center.c (revision 1912) ++++ bin/varnishd/cache_center.c (revision 1913) +@@ -524,7 +524,12 @@ + */ + WSL(sp->wrk, SLT_Debug, sp->fd, + "on waiting list on obj %u", sp->obj->xid); +- assert(!isnan(sp->wrk->used)); ++ /* ++ * There is a non-zero risk that we come here more than once ++ * before we get through, in that case cnt_recv must be set ++ */ ++ if (isnan(sp->wrk->used)) ++ sp->wrk->used = TIM_real(); + SES_Charge(sp); + return (1); + } diff --git a/varnish.spec b/varnish.spec index 773ca6d..ceb4a2b 100644 --- a/varnish.spec +++ b/varnish.spec @@ -1,11 +1,12 @@ Summary: Varnish is a high-performance HTTP accelerator Name: varnish Version: 1.1.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD-like Group: System Environment/Daemons URL: http://www.varnish-cache.org/ Source0: http://downloads.sourceforge.net/varnish/varnish-%{version}.tar.gz +Patch0: varnish-cs1913.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel Requires: kernel >= 2.6.0 varnish-libs = %{version}-%{release} @@ -48,6 +49,8 @@ Varnish is a high-performance HTTP accelerator %prep %setup -q +%patch0 + # The svn sources needs to generate a suitable configure script # Release tarballs would not need this #./autogen.sh @@ -165,6 +168,10 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Wed Sep 08 2007 Ingvar Hagelund - 1.1.1-3 +- Added a patch, changeset 1913 from svn trunk. This makes varnish + more stable under specific loads. + * Tue Sep 06 2007 Ingvar Hagelund - 1.1.1-2 - Removed autogen call (only diff from relase tarball)