+ upstream status fix

(Portage version: 2.0.51.19)

5 files changed, 32 insertions, 6 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 8ea18d80ab35..0bb67e071545 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2005/03/04 17:40:51 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.6 2005/03/10 08:57:50 voxus Exp $
+
+*nginx-0.1.24-r2 (10 Mar 2005)
+
+  10 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.24.ebuild,
+  +nginx-0.1.24-r2.ebuild,
+  +files/nginx-0.1.24-upstream_status.patch:
+  "upstream sent too long status line" fix from author.
 
 *nginx-0.1.24-r1 (04 Mar 2005)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2c65e18a5b0e..ebb410d1db41 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,8 +1,9 @@
-MD5 3b9985845df577ce8e9198da5a107040 nginx-0.1.24.ebuild 2390
-MD5 099d6bdb73761cb07b83380a1ebb1f9b ChangeLog 918
+MD5 76805f4bf8aafdbd232825aede3086fc nginx-0.1.24-r2.ebuild 2516
+MD5 cab90ef2152e99b5026fde1ce3621532 ChangeLog 1155
 MD5 946eec3493a889541333d7697aeb359a nginx-0.1.24-r1.ebuild 2420
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
-MD5 4b6dd57dc730704d18f0b41e3ef2e3ec files/digest-nginx-0.1.24 64
+MD5 f74a821fb78c52685c73508de91ccc07 files/nginx-0.1.24-upstream_status.patch 566
 MD5 8c7b8c93f0c4048d83df9cdc31d86e1b files/nginx 922
 MD5 4b6dd57dc730704d18f0b41e3ef2e3ec files/digest-nginx-0.1.24-r1 64
+MD5 4b6dd57dc730704d18f0b41e3ef2e3ec files/digest-nginx-0.1.24-r2 64
 MD5 b3342c18a1880b574cbe4458560019c6 files/nginx.conf 1445
diff --git a/www-servers/nginx/files/digest-nginx-0.1.24 b/www-servers/nginx/files/digest-nginx-0.1.24-r2
index 7a8550a38664..7a8550a38664 100644
--- a/www-servers/nginx/files/digest-nginx-0.1.24
+++ b/www-servers/nginx/files/digest-nginx-0.1.24-r2
diff --git a/www-servers/nginx/files/nginx-0.1.24-upstream_status.patch b/www-servers/nginx/files/nginx-0.1.24-upstream_status.patch
new file mode 100644
index 000000000000..7fda2c8cf0d9
--- /dev/null
+++ b/www-servers/nginx/files/nginx-0.1.24-upstream_status.patch
@@ -0,0 +1,11 @@
+--- src/http/modules/proxy/ngx_http_proxy_upstream.c	Sat Mar  5 20:18:50 2005
++++ src/http/modules/proxy/ngx_http_proxy_upstream.c	Wed Mar  9 19:28:54 2005
+@@ -1016,7 +1016,7 @@
+     rc = ngx_http_proxy_parse_status_line(p);
+ 
+     if (rc == NGX_AGAIN) {
+-        if (p->header_in->pos == p->header_in->last) {
++        if (p->header_in->last == p->header_in->end) {
+             ngx_log_error(NGX_LOG_ERR, rev->log, 0,
+                           "upstream sent too long status line");
+             ngx_http_proxy_next_upstream(p, NGX_HTTP_PROXY_FT_INVALID_HEADER);
diff --git a/www-servers/nginx/nginx-0.1.24.ebuild b/www-servers/nginx/nginx-0.1.24-r2.ebuild
index 4d772fb56cad..4f0294b4b92d 100644
--- a/www-servers/nginx/nginx-0.1.24.ebuild
+++ b/www-servers/nginx/nginx-0.1.24-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.24.ebuild,v 1.1 2005/03/04 14:54:50 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.24-r2.ebuild,v 1.1 2005/03/10 08:57:50 voxus Exp $
 
 inherit eutils
 
@@ -17,6 +17,11 @@ DEPEND="dev-lang/perl
 	ssl? ( dev-libs/openssl )
 	zlib? ( sys-libs/zlib )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S} && epatch ${FILESDIR}/${P}-upstream_status.patch || die
+}
+
 src_compile() {
 	local myconf
 
@@ -61,6 +66,8 @@ src_install() {
 	cd ${S} || die
 
 	dodir /var/log/${PN}
+	keepdir /var/log/${PN}
+
 	dodir /var/tmp/${PN}
 
 	dodir /var/tmp/${PN}/client
@@ -79,7 +86,7 @@ src_install() {
 
 	insinto /etc/${PN}
 	rm conf/nginx.conf
-	doins -r conf
+	doins -r conf/*
 	doins ${FILESDIR}/nginx.conf
 
 	dodoc CHANGES{,.ru} LICENSE README