1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
|
diff --git a/src/ngx_http_headers_more_headers_in.c b/src/ngx_http_headers_more_headers_in.c
index c3eb8f7..84c7525 100644
--- a/src/ngx_http_headers_more_headers_in.c
+++ b/src/ngx_http_headers_more_headers_in.c
@@ -158,9 +158,15 @@ static ngx_http_headers_more_set_header_t ngx_http_headers_more_set_handlers[]
ngx_http_set_builtin_header },
#endif
+#if defined(nginx_version) && nginx_version >= 1023000
+ { ngx_string("Cookie"),
+ offsetof(ngx_http_headers_in_t, cookie),
+ ngx_http_set_builtin_multi_header },
+#else
{ ngx_string("Cookie"),
offsetof(ngx_http_headers_in_t, cookies),
ngx_http_set_builtin_multi_header },
+#endif
{ ngx_null_string, 0, ngx_http_set_header }
};
diff --git a/.travis.yml b/.travis.yml
index 9748a99..bf40b31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ env:
matrix:
- NGINX_VERSION=1.19.3
- NGINX_VERSION=1.19.9
+ - NGINX_VERSION=1.23.0
before_install:
- sudo apt-get update -y
@@ -51,3 +52,4 @@ script:
- export NGX_BUILD_CC=$CC
- sh util/build.sh $NGINX_VERSION > build.log 2>&1 || (cat build.log && exit 1)
- prove -I. -r t
+
diff --git a/src/ngx_http_headers_more_headers_in.c b/src/ngx_http_headers_more_headers_in.c
index 84c7525..11447ce 100644
--- a/src/ngx_http_headers_more_headers_in.c
+++ b/src/ngx_http_headers_more_headers_in.c
@@ -758,6 +758,50 @@ static ngx_int_t
ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
{
+#if defined(nginx_version) && nginx_version >= 1023000
+ ngx_table_elt_t **headers, **ph, *h;
+ int nelts;
+
+ if (r->headers_out.status == 400 || r->headers_in.headers.last == NULL) {
+ /* must be a 400 Bad Request */
+ return NGX_OK;
+ }
+
+ headers = (ngx_table_elt_t **) ((char *) &r->headers_in + hv->offset);
+
+ if (*headers) {
+ nelts = 0;
+ for (h = *headers; h; h = h->next) {
+ nelts++;
+ }
+
+ *headers = NULL;
+
+ dd("clear multi-value headers: %d", nelts);
+ }
+
+ if (ngx_http_set_header_helper(r, hv, value, &h) == NGX_ERROR) {
+ return NGX_ERROR;
+ }
+
+ if (value->len == 0) {
+ return NGX_OK;
+ }
+
+ dd("new multi-value header: %p", h);
+
+ if (*headers) {
+ for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ }
+ *ph = h;
+
+ } else {
+ *headers = h;
+ }
+
+ h->next = NULL;
+
+ return NGX_OK;
+#else
ngx_array_t *headers;
ngx_table_elt_t **v, *h;
@@ -810,6 +854,7 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
*v = h;
return NGX_OK;
+#endif
}
@@ -842,6 +887,7 @@ ngx_http_headers_more_validate_host(ngx_str_t *host, ngx_pool_t *pool,
if (dot_pos == i - 1) {
return NGX_DECLINED;
}
+
dot_pos = i;
break;
diff --git a/src/ngx_http_headers_more_headers_out.c b/src/ngx_http_headers_more_headers_out.c
index 0f9bc87..9d58ede 100644
--- a/src/ngx_http_headers_more_headers_out.c
+++ b/src/ngx_http_headers_more_headers_out.c
@@ -327,6 +327,46 @@ static ngx_int_t
ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
ngx_http_headers_more_header_val_t *hv, ngx_str_t *value)
{
+#if defined(nginx_version) && nginx_version >= 1023000
+ ngx_table_elt_t **headers, *h, *ho, **ph;
+
+ headers = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
+
+ if (*headers) {
+ for (h = (*headers)->next; h; h = h->next) {
+ h->hash = 0;
+ h->value.len = 0;
+ }
+
+ h = *headers;
+
+ h->value = *value;
+
+ if (value->len == 0) {
+ h->hash = 0;
+
+ } else {
+ h->hash = hv->hash;
+ }
+
+ return NGX_OK;
+ }
+
+ for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ }
+
+ ho = ngx_list_push(&r->headers_out.headers);
+ if (ho == NULL) {
+ return NGX_ERROR;
+ }
+
+ ho->value = *value;
+ ho->hash = hv->hash;
+ ngx_str_set(&ho->key, "Cache-Control");
+ ho->next = NULL;
+ *ph = ho;
+
+ return NGX_OK;
+#else
ngx_array_t *pa;
ngx_table_elt_t *ho, **ph;
ngx_uint_t i;
@@ -378,6 +418,7 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
*ph = ho;
return NGX_OK;
+#endif
}
diff --git a/src/ngx_http_headers_more_util.c b/src/ngx_http_headers_more_util.c
index caf372e..e1f3636 100644
--- a/src/ngx_http_headers_more_util.c
+++ b/src/ngx_http_headers_more_util.c
@@ -295,6 +295,7 @@ ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
if (part->next == NULL) {
return NGX_ERROR;
}
+
part = part->next;
}
@@ -338,6 +339,7 @@ ngx_http_headers_more_rm_header_helper(ngx_list_t *l, ngx_list_part_t *cur,
if (part->next == NULL) {
return NGX_ERROR;
}
+
part = part->next;
}
|
