fixed the variable_header_ignore_no_hash patch again. thanks Markus Linnala.
This commit is contained in:
parent
98893fe49c
commit
8630761254
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue