186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

fixed the variable_header_ignore_no_hash patch again. thanks Markus Linnala.

Browse Source
This commit is contained in:
agentzh (章亦春)
2011-11-08 22:26:39 +08:00
parent 98893fe49c
commit 8630761254
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/nginx-1.0.9-variable_header_ignore_no_hash.patch
View File

@ -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/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 @@ @@ -648,7 +648,17 @@
a = (ngx_array_t *) ((char *) r + data); a = (ngx_array_t *) ((char *) r + data);
@ -44,12 +44,10 @@
len += h[i]->value.len + sizeof("; ") - 1; len += h[i]->value.len + sizeof("; ") - 1;
} }
@@ -682,7 +695,12 @@ @@ -683,9 +696,14 @@
v->len = len;
v->data = p; v->data = p;
- for (i = 0; /* void */ ; i++) { for (i = 0; /* void */ ; i++) {
+ for (i = 0; i < n; i++) {
+ +
+ if (h[i]->hash == 0) { + if (h[i]->hash == 0) {
+ continue; + continue;
@ -57,7 +55,11 @@
+ +
p = ngx_copy(p, h[i]->value.data, h[i]->value.len); 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 @@ @@ -738,6 +756,10 @@
i = 0; i = 0;
} }