make HTTP_HDR_MAX_VAL configurable in case broken webapps set more than 32 headers; only start varnishncsa logging if desired

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 27 insertions, 12 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 80c0fbd2686b..5d15355e57f8 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.25 2009/07/12 12:04:06 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.26 2009/08/30 06:28:07 hollow Exp $
+
+  30 Aug 2009; Benedikt Böhm <hollow@gentoo.org> varnish-2.0.4-r1.ebuild,
+  files/varnishd.initd:
+  make HTTP_HDR_MAX_VAL configurable in case broken webapps set more than 32
+  headers; only start varnishncsa logging if desired
 
 *varnish-2.0.4-r1 (12 Jul 2009)
 
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index bd33fc69ed79..6fda677c7b19 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,10 +1,10 @@
 AUX varnish-2.0.4-link-order.patch 1163 RMD160 35a19df782493e71ac6645278cba7857509ede5d SHA1 28ef7346f0cdbe08acd6ea0ce95589108d7138eb SHA256 f1e796285ca4427619ed493b0bea17366260c7cb72e9edb86faa3b18421206c9
 AUX varnish-2.0.4-virtual-ncsa.patch 1722 RMD160 b5c99f2c5c39e9adc52ba4933b33813e600df374 SHA1 15e090b3d6c81e588a514eed9e57a22eb8c2fe35 SHA256 f7a2fd243c1a103dc4d26b1deb6d11d3a0d604ebbc4315520777769886b60227
 AUX varnishd.confd 311 RMD160 7ae692df018d0a889f4465ec9436b56a2b8d6368 SHA1 44abde826e884c35ff0748c62fe470dcdc2bb914 SHA256 06330cb231b6d64d85be34e5537c3c8741c0d50291f82cd549a2d0685f294e37
-AUX varnishd.initd 948 RMD160 12498c223d97d8278883881662d2dd79647dea82 SHA1 7afd7165cd32488bc05b2bd2d9ece4e224e46685 SHA256 4583c2883dde2f476a600325bd66f3e16193628bb57f934c2f443d1e77b9ced7
+AUX varnishd.initd 1047 RMD160 3afab33ab08be488111de692d8e6e06d05cf33ff SHA1 a19eab18e12550b0b16232f404badf24adc3c443 SHA256 e8c46f79bf38a6e6aebfbbfea6dcbdd69865527301d03928c7ee4f2a379624a5
 AUX varnishd.logrotate 115 RMD160 975e67b1250be86eec8b02c043e89dc045cc2d1e SHA1 f5fbed252083090c8a138063031be62e840137ee SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e
 DIST varnish-2.0.4.tar.gz 786945 RMD160 93f94555f42205ff5f324e76acb121c8da71f6e9 SHA1 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
-EBUILD varnish-2.0.4-r1.ebuild 1212 RMD160 04daeacd461f79c1008322d13f03e077c41c4c93 SHA1 3a9300d08b58e5c77324956e2119b5dc4028df82 SHA256 fe45f5e55b6ca5508fdcb7d0e3409fefe9e82a2c11412f8152ada200cedecbbb
+EBUILD varnish-2.0.4-r1.ebuild 1367 RMD160 c38a52097d9990109ecf6c683ddac9a1016286b9 SHA1 56f507683d4428795355ae294eda3e6fccb48e55 SHA256 7922df0351c4d01802b8bd3a35cc847182ca4b04764fc747dca6d2586eae2db2
 EBUILD varnish-2.0.4.ebuild 1106 RMD160 f1453b238c43543016c3ce9295d8d04ad2aa808d SHA1 158705e695b753ea7cd59eb83f5a76f730788279 SHA256 017848c5e2434d7aedda89c8f7e6d133821771b9f6ef8b5dff35e0d43325adef
-MISC ChangeLog 4031 RMD160 e67cbae137ca48091d2498552bdada99dfb73919 SHA1 4c3bf8f6ba6ac5d66449219d49a962664d780f82 SHA256 2a189fb6fa003371426aacc5e7faa5a0cbd4c0710d62e699e60ea986125f787b
+MISC ChangeLog 4260 RMD160 9d8d70964d330b1858c9fe1c918ff0b348e8919c SHA1 d14fbc7537ae48629a54d6ef6648ca7533023fb7 SHA256 cfbf1fcd4868158282fc5292206921a903bad96446292437b2a26ec3d19753c0
 MISC metadata.xml 1026 RMD160 e7e9f2813e22bea7b993644082badd89460d3d7f SHA1 3bd5b7b70bb6904df77374f7df74f6cedf074d08 SHA256 fda15c7ee0557ab9d595e3e98caa18bc7b3da81875bbac233f312b32eb4d84f5
diff --git a/www-servers/varnish/files/varnishd.initd b/www-servers/varnish/files/varnishd.initd
index 2ba1b7b7cdfb..f65cce7122f8 100755
--- a/www-servers/varnish/files/varnishd.initd
+++ b/www-servers/varnish/files/varnishd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.6 2009/07/12 12:04:06 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.7 2009/08/30 06:28:07 hollow Exp $
 
 depend() {
 	need net
@@ -13,16 +13,22 @@ start() {
 	ulimit -l 82000
 	start-stop-daemon --quiet --start --pidfile /var/run/varnishd.pid --exec /usr/sbin/varnishd -- -P /var/run/varnishd.pid ${VARNISHD_OPTS} &> /dev/null
 	eend $?
-	ebegin "Starting varnish logging"
-	start-stop-daemon --quiet --start --pidfile /var/run/varnishncsa.pid --exec /usr/bin/varnishncsa -- -D -P /var/run/varnishncsa.pid ${VARNISHNCSA_ARGS}
-	eend $?
+
+	if [ "${VARNISHNCSA_ARGS}" != "" ]; then
+		ebegin "Starting varnish logging"
+		start-stop-daemon --quiet --start --pidfile /var/run/varnishncsa.pid --exec /usr/bin/varnishncsa -- -D -P /var/run/varnishncsa.pid ${VARNISHNCSA_ARGS}
+		eend $?
+	fi
 }
 
 stop() {
 	ebegin "Stopping varnish"
 	start-stop-daemon --quiet --stop --pidfile /var/run/varnishd.pid
 	eend $?
-	ebegin "Stopping varnish logging"
-	start-stop-daemon --quiet --stop --pidfile /var/run/varnishncsa.pid
-	eend $?
+
+	if [ -e /var/run/varnishncsa.pid ]; then
+		ebegin "Stopping varnish logging"
+		start-stop-daemon --quiet --stop --pidfile /var/run/varnishncsa.pid
+		eend $?
+	fi
 }
diff --git a/www-servers/varnish/varnish-2.0.4-r1.ebuild b/www-servers/varnish/varnish-2.0.4-r1.ebuild
index 839d7a4f6a8a..00368fc766f5 100644
--- a/www-servers/varnish/varnish-2.0.4-r1.ebuild
+++ b/www-servers/varnish/varnish-2.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.4-r1.ebuild,v 1.1 2009/07/12 12:04:06 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.4-r1.ebuild,v 1.2 2009/08/30 06:28:07 hollow Exp $
 
 EAPI="2"
 
@@ -17,9 +17,13 @@ IUSE=""
 #varnish compiles stuff at run time
 RDEPEND="sys-devel/gcc"
 
+HTTP_HDR_MAX_VAL=${HTTP_HDR_MAX_VAL:-32}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-link-order.patch
 	epatch "${FILESDIR}"/${P}-virtual-ncsa.patch
+	sed -e "s/#define HTTP_HDR_MAX_VAL .*/#define HTTP_HDR_MAX_VAL ${HTTP_HDR_MAX_VAL}/" \
+		-i bin/varnishd/cache.h
 	eautoreconf
 }