+ 2 minor patches from author

(Portage version: 2.0.51.22-r1)

6 files changed, 62 insertions, 3 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index bfff8dc00f63..3642653de871 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,14 @@
 # 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.25 2005/05/24 09:26:08 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.26 2005/05/26 16:00:17 voxus Exp $
+
+*nginx-0.1.33 (26 May 2005)
+
+  26 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.33-r1.ebuild,
+  +files/nginx-0.1.33-large_ssi_includes.patch,
+  +files/nginx-0.1.33-set_header_range.patch, -nginx-0.1.33.ebuild:
+  Fix against infinitive cycle in large ssi includes and ability to set Range
+  header. Patches provided by author.
 
   24 May 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.29-r2.ebuild,
   -nginx-0.1.30-r1.ebuild, -nginx-0.1.31.ebuild, -nginx-0.1.32.ebuild,
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 1c2785aeb912..3106e9179569 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,11 +1,15 @@
 MD5 6dac6b9c81f11cd9f40c062911aa471f nginx-0.1.33.ebuild 2075
+MD5 38d29a9ec3599839a3a1c08a981c03e0 nginx-0.1.33-r1.ebuild 2144
 MD5 0b612ee125685634d4e80df6e302d442 nginx-0.1.28-r2.ebuild 2082
-MD5 f5abd3c1a0d4bc5262ce6d81cd759348 ChangeLog 4437
+MD5 0fd1929e20ae0bfd96688c52dfa653ad ChangeLog 4778
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 MD5 583f1973d39fec70c44090b71125f1e2 files/digest-nginx-0.1.33 64
 MD5 8c7b8c93f0c4048d83df9cdc31d86e1b files/nginx 922
+MD5 97d5db2450a9a9c85ff02614b9352b9b files/nginx-0.1.33-large_ssi_includes.patch 949
 MD5 964b96268e483e663e4ea13d03320185 files/digest-nginx-0.1.28-r2 64
+MD5 583f1973d39fec70c44090b71125f1e2 files/digest-nginx-0.1.33-r1 64
 MD5 a7b2073cd531459fc68972b181018465 files/nginx-0.1.29-500_bytes_long.patch 402
+MD5 f836e5e56bd706ef144644e345f35c8a files/nginx-0.1.33-set_header_range.patch 473
 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.33 b/www-servers/nginx/files/digest-nginx-0.1.33-r1
index 47854ae75931..47854ae75931 100644
--- a/www-servers/nginx/files/digest-nginx-0.1.33
+++ b/www-servers/nginx/files/digest-nginx-0.1.33-r1
diff --git a/www-servers/nginx/files/nginx-0.1.33-large_ssi_includes.patch b/www-servers/nginx/files/nginx-0.1.33-large_ssi_includes.patch
new file mode 100644
index 000000000000..6acb7d86a43a
--- /dev/null
+++ b/www-servers/nginx/files/nginx-0.1.33-large_ssi_includes.patch
@@ -0,0 +1,29 @@
+--- src/http/ngx_http_postpone_filter_module.c	Mon May 16 15:47:40 2005
++++ src/http/ngx_http_postpone_filter_module.c	Thu May 26 18:33:47 2005
+@@ -45,6 +45,7 @@
+ {
+     ngx_int_t                      rc;
+     ngx_chain_t                   *out;
++    ngx_http_request_t            *mr;
+     ngx_http_postponed_request_t  *pr, **ppr;
+ 
+     if (r->connection->write->error) {
+@@ -98,14 +99,16 @@
+         out = in;
+     }
+ 
+-    if (out == NULL && r->out == NULL && !r->connection->buffered) {
++    mr = r->main ? r->main : r;
++
++    if (out == NULL && mr->out == NULL && !mr->connection->buffered) {
+         return NGX_OK;
+     }
+ 
+     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                    "http postpone filter out \"%V\"", &r->uri);
+ 
+-    rc = ngx_http_next_filter(r->main ? r->main : r, out);
++    rc = ngx_http_next_filter(mr, out);
+ 
+     if (rc == NGX_ERROR) {
+         /* NGX_ERROR may be returned by any filter */
diff --git a/www-servers/nginx/files/nginx-0.1.33-set_header_range.patch b/www-servers/nginx/files/nginx-0.1.33-set_header_range.patch
new file mode 100644
index 000000000000..5b05f97b1b0e
--- /dev/null
+++ b/www-servers/nginx/files/nginx-0.1.33-set_header_range.patch
@@ -0,0 +1,13 @@
+--- src/http/modules/ngx_http_proxy_module.c	Sat May 21 18:49:18 2005
++++ src/http/modules/ngx_http_proxy_module.c	Mon May 23 16:22:30 2005
+@@ -1576,6 +1576,10 @@
+ 
+         *name = src[i].key;
+ 
++        if (src[i].value.len == 0) {
++            continue;
++        }
++
+         if (ngx_http_script_variables_count(&src[i].value) == 0) {
+             copy = ngx_array_push_n(conf->headers_set_len,
+                                     sizeof(ngx_http_script_copy_code_t));
diff --git a/www-servers/nginx/nginx-0.1.33.ebuild b/www-servers/nginx/nginx-0.1.33-r1.ebuild
index a27fb705d8e7..fe09db819945 100644
--- a/www-servers/nginx/nginx-0.1.33.ebuild
+++ b/www-servers/nginx/nginx-0.1.33-r1.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.33.ebuild,v 1.1 2005/05/23 12:42:03 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.33-r1.ebuild,v 1.1 2005/05/26 16:00:17 voxus Exp $
 
 inherit eutils
 
@@ -18,6 +18,11 @@ DEPEND="dev-lang/perl
 	ssl? ( dev-libs/openssl )
 	zlib? ( sys-libs/zlib )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S} && epatch ${FILESDIR}/${P}-*
+}
+
 src_compile() {
 	local myconf