rpms/varnish/F-7 varnish-cs1913.patch, NONE, 1.1 varnish.spec, 1.3, 1.4
Ingvar Hagelund (ingvar)
fedora-extras-commits at redhat.com
Fri Sep 7 22:12:45 UTC 2007
- Previous message (by thread): rpms/balsa/FC-6 .cvsignore, 1.17, 1.18 balsa.spec, 1.24, 1.25 sources, 1.17, 1.18
- Next message (by thread): rpms/varnish/devel varnish-cs1913.patch, NONE, 1.1 varnish.spec, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ingvar
Update of /cvs/extras/rpms/varnish/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20618
Modified Files:
varnish.spec
Added Files:
varnish-cs1913.patch
Log Message:
* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
- Added a patch, changeset 1913 from svn trunk. This makes varnish
more stable under specific loads.
varnish-cs1913.patch:
--- NEW FILE varnish-cs1913.patch ---
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);
}
Index: varnish.spec
===================================================================
RCS file: /cvs/extras/rpms/varnish/F-7/varnish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- varnish.spec 6 Sep 2007 20:23:42 -0000 1.3
+++ varnish.spec 7 Sep 2007 22:12:12 -0000 1.4
@@ -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 @@
%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 @@
%postun libs -p /sbin/ldconfig
%changelog
+* Wed Sep 08 2007 Ingvar Hagelund <ingvar at linpro.no> - 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 <ingvar at linpro.no> - 1.1.1-2
- Removed autogen call (only diff from relase tarball)
- Previous message (by thread): rpms/balsa/FC-6 .cvsignore, 1.17, 1.18 balsa.spec, 1.24, 1.25 sources, 1.17, 1.18
- Next message (by thread): rpms/varnish/devel varnish-cs1913.patch, NONE, 1.1 varnish.spec, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list