From 86307612540b487907ee32b435bd8a57123711ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?= Date: Tue, 8 Nov 2011 22:26:39 +0800 Subject: [PATCH 1/2] fixed the variable_header_ignore_no_hash patch again. thanks Markus Linnala. --- ...ginx-1.0.9-variable_header_ignore_no_hash.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/nginx-1.0.9-variable_header_ignore_no_hash.patch b/patches/nginx-1.0.9-variable_header_ignore_no_hash.patch index 554078f..aaaeb00 100644 --- a/patches/nginx-1.0.9-variable_header_ignore_no_hash.patch +++ b/patches/nginx-1.0.9-variable_header_ignore_no_hash.patch @@ -1,5 +1,5 @@ --- nginx-1.0.9/src/http/ngx_http_variables.c 2011-05-30 20:36:17.000000000 +0800 -+++ nginx-1.0.9-patched/src/http/ngx_http_variables.c 2011-11-08 21:39:28.509366052 +0800 ++++ nginx-1.0.9-patched/src/http/ngx_http_variables.c 2011-11-08 22:21:55.229247198 +0800 @@ -648,7 +648,17 @@ a = (ngx_array_t *) ((char *) r + data); @@ -44,12 +44,10 @@ len += h[i]->value.len + sizeof("; ") - 1; } -@@ -682,7 +695,12 @@ - v->len = len; +@@ -683,9 +696,14 @@ v->data = p; -- for (i = 0; /* void */ ; i++) { -+ for (i = 0; i < n; i++) { + for (i = 0; /* void */ ; i++) { + + if (h[i]->hash == 0) { + continue; @@ -57,7 +55,11 @@ + p = ngx_copy(p, h[i]->value.data, h[i]->value.len); - if (i == n - 1) { +- if (i == n - 1) { ++ if (--n == 0) { + break; + } + @@ -738,6 +756,10 @@ i = 0; } From 88b615731373c70407c37aba66d4f5d3abbe1768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?= Date: Wed, 9 Nov 2011 17:42:59 +0800 Subject: [PATCH 2/2] upgraded ngx_lua to 0.3.1rc27 and ngx_drizzle to 0.1.2rc3; released ngx_openresty 1.0.9.3. --- util/mirror-tarballs | 4 ++-- util/ver | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 2842a9f..59b0309 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -98,14 +98,14 @@ mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1 ################################# -ver=0.1.2rc2 +ver=0.1.2rc3 $root/util/get-tarball "http://github.com/chaoslawful/drizzle-nginx-module/tarball/v$ver" -O drizzle-nginx-module-$ver.tar.gz || exit 1 tar -xzf drizzle-nginx-module-$ver.tar.gz || exit 1 mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1 ################################# -ver=0.3.1rc26 +ver=0.3.1rc27 $root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1 mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1 diff --git a/util/ver b/util/ver index 4b8700f..289d9e4 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=1.0.9 -minor_ver=1 +minor_ver=3 version=$main_ver.$minor_ver echo $version