+ broken backend headers correct handling

Package-Manager: portage-2.0.51.19

5 files changed, 118 insertions, 2 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 6b234d4498f9..c0d3a061ad99 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.13 2005/04/11 08:14:07 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.14 2005/04/19 12:58:30 voxus Exp $
+
+*nginx-0.1.28-r1 (19 Apr 2005)
+
+  19 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.28-r1.ebuild,
+  +files/nginx-0.1.28-bad_backend_header.patch:
+  Patch from author to avoid crash when backend sends b0rked headers.
 
 *nginx-0.1.28 (11 Apr 2005)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index c48eb593e32e..1346ecaa3458 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,9 @@
 MD5 dbde4e3c6b7bc268ee2e8808a2514d07 nginx-0.1.28.ebuild 1842
-MD5 146a2265d7ff09efd8e3343b82377dfe ChangeLog 2247
+MD5 5c80fdd8628ed18109d45e32e5bacb2a nginx-0.1.28-r1.ebuild 1939
+MD5 875eb770d57b4e54dbe3d54c3045856e ChangeLog 2477
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 MD5 964b96268e483e663e4ea13d03320185 files/digest-nginx-0.1.28 64
 MD5 8c7b8c93f0c4048d83df9cdc31d86e1b files/nginx 922
+MD5 964b96268e483e663e4ea13d03320185 files/digest-nginx-0.1.28-r1 64
+MD5 148b61099c94cfc02add671522699a48 files/nginx-0.1.28-bad_backend_header.patch 656
 MD5 b3342c18a1880b574cbe4458560019c6 files/nginx.conf 1445
diff --git a/www-servers/nginx/files/digest-nginx-0.1.28-r1 b/www-servers/nginx/files/digest-nginx-0.1.28-r1
new file mode 100644
index 000000000000..a895eff9fe53
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.1.28-r1
@@ -0,0 +1 @@
+MD5 48e44b94234ff04cc276f0814cee551d nginx-0.1.28.tar.gz 298412
diff --git a/www-servers/nginx/files/nginx-0.1.28-bad_backend_header.patch b/www-servers/nginx/files/nginx-0.1.28-bad_backend_header.patch
new file mode 100644
index 000000000000..dccfaafd068d
--- /dev/null
+++ b/www-servers/nginx/files/nginx-0.1.28-bad_backend_header.patch
@@ -0,0 +1,22 @@
+--- src/http/modules/proxy/ngx_http_proxy_upstream.c	Mon Apr 18 18:00:53 2005
++++ src/http/modules/proxy/ngx_http_proxy_upstream.c	Tue Apr 19 16:31:48 2005
+@@ -1175,7 +1175,7 @@
+ 
+         rc = ngx_http_parse_header_line(p->request, p->header_in);
+ 
+-        if (rc == NGX_OK) {
++        if (rc == NGX_OK && !r->invalid_header) {
+ 
+             /* a header line has been parsed successfully */
+ 
+@@ -1241,6 +1241,10 @@
+             return;
+ 
+         } else if (rc != NGX_AGAIN) {
++
++            if (r->invalid_header) {
++                rc = NGX_HTTP_PARSE_INVALID_HEADER;
++            }
+ 
+             /* there was error while a header line parsing */
+ 
diff --git a/www-servers/nginx/nginx-0.1.28-r1.ebuild b/www-servers/nginx/nginx-0.1.28-r1.ebuild
new file mode 100644
index 000000000000..6ea17f1e08bf
--- /dev/null
+++ b/www-servers/nginx/nginx-0.1.28-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.28-r1.ebuild,v 1.1 2005/04/19 12:58:30 voxus Exp $
+
+inherit eutils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+
+HOMEPAGE="http://sysoev.ru/nginx/"
+SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl zlib threads"
+
+DEPEND="dev-lang/perl
+	ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} && epatch ${FILESDIR}/${P}-bad_backend_header.patch
+}
+
+src_compile() {
+	local myconf
+
+	use ssl				&& myconf="${myconf} --with-http_ssl_module"
+
+	if use threads; then
+		einfo
+		ewarn "threads support is experimental at the moment"
+		ewarn "do not use it on production systems - you've been warned"
+		einfo
+		myconf="${myconf} --with-threads"
+	fi
+
+	use zlib			|| myconf="${myconf} --without-http_gzip_module"
+
+	cd ${S}
+	./configure												\
+		--prefix=/usr										\
+		--conf-path=/etc/${PN}/${PN}.conf					\
+		--http-log-path=/var/log/${PN}/access_log			\
+		--error-log-path=/var/log/${PN}/error_log			\
+		--pid-path=/var/run/${PN}.pid						\
+		--http-client-body-temp-path=/var/tmp/${PN}/client	\
+		--http-proxy-temp-path=/var/tmp/${PN}/proxy			\
+		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi		\
+		--with-md5-asm										\
+		${myconf}
+
+	emake || "failed to compile"
+}
+
+src_install() {
+	cd ${S} || die
+
+	dodir /var/log/${PN}
+	keepdir /var/log/${PN}
+
+	dodir /var/tmp/${PN}
+
+	dodir /var/tmp/${PN}/client
+	keepdir /var/tmp/${PN}/client
+
+	dodir /var/tmp/${PN}/proxy
+	keepdir /var/tmp/${PN}/proxy
+
+	dodir /var/tmp/${PN}/fastcgi
+	keepdir /var/tmp/${PN}/fastcgi
+
+	dodir /etc/${PN}
+
+	dosbin objs/nginx
+	doinitd ${FILESDIR}/nginx
+
+	insinto /etc/${PN}
+	rm conf/nginx.conf
+	doins -r conf/*
+	doins ${FILESDIR}/nginx.conf
+
+	dodoc CHANGES{,.ru} LICENSE README
+}