rpms/varnish
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added a patch from svn r3156 and r3157, hiding a legit errno in make check

Browse Source
This commit is contained in:
Ingvar Hagelund 2008-09-02 20:37:08 +00:00
parent df2061988b
commit 971f3de43e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
varnish.cs3157.patch Normal file
View File

@ -0,0 +1,13 @@
Index: bin/varnishtest/vtc_server.c
===================================================================
--- bin/varnishtest/vtc_server.c (revision 3155)
+++ bin/varnishtest/vtc_server.c (revision 3157)
@@ -97,7 +97,7 @@
vtc_log(vl, 3, "Accepted socket fd is %d", fd);
http_process(vl, s->spec, fd, 0);
vtc_log(vl, 3, "shutting fd %d", fd);
- AZ(shutdown(fd, SHUT_WR));
+ assert((shutdown(fd, SHUT_WR) == 0) || errno == ENOTCONN);
TCP_close(&fd);
}
vtc_log(vl, 2, "Ending");

7
varnish.spec
View File

@ -1,7 +1,7 @@
Summary: Varnish is a high-performance HTTP accelerator Summary: Varnish is a high-performance HTTP accelerator
Name: varnish Name: varnish
Version: 2.0 Version: 2.0
Release: 0.6.beta1%{?dist} Release: 0.7.beta1%{?dist}
License: BSD License: BSD
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.varnish-cache.org/ URL: http://www.varnish-cache.org/
@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/varnish/varnish-2.0-beta1.tar.gz
Patch0: varnish.lockfile.patch Patch0: varnish.lockfile.patch
Patch1: varnish.coresize.patch Patch1: varnish.coresize.patch
Patch2: varnish.vcl_changes.patch Patch2: varnish.vcl_changes.patch
Patch3: varnish.cs3157.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# The svn sources needs autoconf, automake and libtool to generate a suitable # The svn sources needs autoconf, automake and libtool to generate a suitable
# configure script. Release tarballs would not need this # configure script. Release tarballs would not need this
@ -71,6 +72,7 @@ Varnish is a high-performance HTTP accelerator
%patch0 -p0 %patch0 -p0
%patch1 -p0 %patch1 -p0
%patch2 -p0 %patch2 -p0
%patch3 -p0
# The svn sources needs to generate a suitable configure script # The svn sources needs to generate a suitable configure script
# Release tarballs would not need this # Release tarballs would not need this
@ -208,6 +210,9 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Tue Sep 02 2008 Ingvar Hagelund <ingvar@linpro.no> - 2.0-0.7.beta1
- Added a patch from r3156 and r3157, hiding a legit errno in make check
* Tue Sep 02 2008 Ingvar Hagelund <ingvar@linpro.no> - 2.0-0.6.beta1 * Tue Sep 02 2008 Ingvar Hagelund <ingvar@linpro.no> - 2.0-0.6.beta1
- Added a commented option for max coresize in the sysconfig script - Added a commented option for max coresize in the sysconfig script
- Added a comment in README.redhat about upgrading from 1.x to 2.0 - Added a comment in README.redhat about upgrading from 1.x to 2.0