500 fix

(Portage version: 2.0.51.21-r1)

7 files changed, 29 insertions, 88 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 2b85048c6a1f..99e311d0f8b8 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.18 2005/05/13 12:38:44 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.19 2005/05/14 11:51:28 voxus Exp $
+
+*nginx-0.1.29-r2 (14 May 2005)
+
+  14 May 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.29.ebuild,
+  -nginx-0.1.29-r1.ebuild, +files/nginx-0.1.29-500_bytes_long.patch:
+  Fixed 500 http response, when lenght of backend response 500 bytes long.
+  Patch from author.
 
 *nginx-0.1.29-r1 (13 May 2005)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 9969a2811992..c4561b87b16e 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,12 +1,11 @@
-MD5 9c9fbd55ddd607578bae871c855446fb nginx-0.1.29.ebuild 1989
+MD5 c19b601143142976cab27ad0232c3a48 nginx-0.1.29-r2.ebuild 2061
 MD5 0b612ee125685634d4e80df6e302d442 nginx-0.1.28-r2.ebuild 2082
-MD5 008076b9a084a41b64b07860cca3e074 nginx-0.1.29-r1.ebuild 2088
-MD5 bde3c02590d690e54ea971e23621e8ed ChangeLog 3212
+MD5 d0e92e077cc3e3424f436a4740e180d3 ChangeLog 3486
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
-MD5 4e72c813c956580f61dea414fe1af8b3 files/digest-nginx-0.1.29 64
 MD5 8c7b8c93f0c4048d83df9cdc31d86e1b files/nginx 922
 MD5 964b96268e483e663e4ea13d03320185 files/digest-nginx-0.1.28-r2 64
-MD5 4e72c813c956580f61dea414fe1af8b3 files/digest-nginx-0.1.29-r1 64
+MD5 4e72c813c956580f61dea414fe1af8b3 files/digest-nginx-0.1.29-r2 64
+MD5 a7b2073cd531459fc68972b181018465 files/nginx-0.1.29-500_bytes_long.patch 402
 MD5 148b61099c94cfc02add671522699a48 files/nginx-0.1.28-bad_backend_header.patch 656
 MD5 b3342c18a1880b574cbe4458560019c6 files/nginx.conf 1445
 MD5 c7b08f10d672ae9fa9f09c4b7439b5be files/nginx-0.1.29-ignore_invalid_headers.patch 3579
diff --git a/www-servers/nginx/files/digest-nginx-0.1.29-r1 b/www-servers/nginx/files/digest-nginx-0.1.29-r1
deleted file mode 100644
index 7d101a0eb227..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.1.29-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3cc24d511144d2a9e553e9a2296ef9e0 nginx-0.1.29.tar.gz 291855
diff --git a/www-servers/nginx/files/digest-nginx-0.1.29 b/www-servers/nginx/files/digest-nginx-0.1.29-r2
index 7d101a0eb227..7d101a0eb227 100644
--- a/www-servers/nginx/files/digest-nginx-0.1.29
+++ b/www-servers/nginx/files/digest-nginx-0.1.29-r2
diff --git a/www-servers/nginx/files/nginx-0.1.29-500_bytes_long.patch b/www-servers/nginx/files/nginx-0.1.29-500_bytes_long.patch
new file mode 100644
index 000000000000..3a3097fb06ae
--- /dev/null
+++ b/www-servers/nginx/files/nginx-0.1.29-500_bytes_long.patch
@@ -0,0 +1,15 @@
+--- src/http/ngx_http_upstream.c	Fri May  6 22:45:06 2005
++++ src/http/ngx_http_upstream.c	Sat May 14 15:23:11 2005
+@@ -779,12 +779,6 @@
+         return;
+     }
+ 
+-    if (n == NGX_HTTP_INTERNAL_SERVER_ERROR) {
+-        ngx_http_upstream_finalize_request(r, u,
+-                                           NGX_HTTP_INTERNAL_SERVER_ERROR);
+-        return;
+-    }
+-
+     u->header_in.last += n;
+ 
+ #if 0
diff --git a/www-servers/nginx/nginx-0.1.29-r1.ebuild b/www-servers/nginx/nginx-0.1.29-r2.ebuild
index 4408699f7c6a..06fd99c91886 100644
--- a/www-servers/nginx/nginx-0.1.29-r1.ebuild
+++ b/www-servers/nginx/nginx-0.1.29-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.29-r1.ebuild,v 1.1 2005/05/13 12:38:44 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.29-r2.ebuild,v 1.1 2005/05/14 11:51:28 voxus Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ DEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${A}
-	cd ${S} && epatch ${FILESDIR}/${P}-ignore_invalid_headers.patch
+	cd ${S} && epatch ${FILESDIR}/${P}-*
 }
 
 src_compile() {
diff --git a/www-servers/nginx/nginx-0.1.29.ebuild b/www-servers/nginx/nginx-0.1.29.ebuild
deleted file mode 100644
index a3ea39692352..000000000000
--- a/www-servers/nginx/nginx-0.1.29.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.29.ebuild,v 1.1 2005/05/13 10:41:07 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="debug fastcgi threads ssl zlib"
-
-DEPEND="dev-lang/perl
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )"
-
-src_compile() {
-	local myconf
-
-	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 fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use zlib	|| myconf="${myconf} --without-http_gzip_module"
-	use debug	&& myconf="${myconf} --with-debug"
-	use ssl		&& myconf="${myconf} --with-http_ssl_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} || die "configure failed"
-
-	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
-}