Compare commits

..

5 Commits

4 changed files with 18 additions and 12 deletions

View File

@ -1,5 +1,5 @@
--- nginx-1.0.9/src/http/ngx_http_variables.c 2011-05-30 05:36:17.000000000 -0700
+++ nginx-1.0.9-patched/src/http/ngx_http_variables.c 2011-09-30 10:59:05.000000000 -0700
--- 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 22:21:55.229247198 +0800
@@ -648,7 +648,17 @@
a = (ngx_array_t *) ((char *) r + data);
@ -44,7 +44,7 @@
len += h[i]->value.len + sizeof("; ") - 1;
}
@@ -683,6 +696,11 @@
@@ -683,9 +696,14 @@
v->data = p;
for (i = 0; /* void */ ; i++) {
@ -55,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;
}

View File

@ -1,5 +1,5 @@
--- nginx-1.1.4/src/http/ngx_http_variables.c 2011-05-30 05:36:17.000000000 -0700
+++ nginx-1.1.4-patched/src/http/ngx_http_variables.c 2011-09-30 10:59:05.000000000 -0700
--- nginx-1.1.4/src/http/ngx_http_variables.c 2011-05-30 20:36:17.000000000 +0800
+++ nginx-1.1.4-patched/src/http/ngx_http_variables.c 2011-11-08 21:39:28.509366052 +0800
@@ -648,7 +648,17 @@
a = (ngx_array_t *) ((char *) r + data);
@ -44,10 +44,12 @@
len += h[i]->value.len + sizeof("; ") - 1;
}
@@ -683,6 +696,11 @@
@@ -682,7 +695,12 @@
v->len = len;
v->data = p;
for (i = 0; /* void */ ; i++) {
- for (i = 0; /* void */ ; i++) {
+ for (i = 0; i < n; i++) {
+
+ if (h[i]->hash == 0) {
+ continue;

View File

@ -91,21 +91,21 @@ $root/util/get-tarball "http://github.com/agentzh/rds-csv-nginx-module/tarball/v
tar -xzf rds-csv-nginx-module-$ver.tar.gz || exit 1
mv agentzh-rds-csv-nginx-module-* rds-csv-nginx-module-$ver || exit 1
ver=0.16rc3
ver=0.16rc4
$root/util/get-tarball "http://github.com/agentzh/headers-more-nginx-module/tarball/v$ver" -O headers-more-nginx-module-$ver.tar.gz || exit 1
tar -xzf headers-more-nginx-module-$ver.tar.gz || exit 1
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.1rc28
$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

View File

@ -1,7 +1,7 @@
#!/bin/bash
main_ver=1.0.9
minor_ver=1
minor_ver=5
version=$main_ver.$minor_ver
echo $version