mirror of
https://github.com/nginx/nginx.git
synced 2024-11-24 04:49:01 +08:00
Proxy: fixed proxy_method to always add space.
Before the patch if proxy_method was specified at http{} level the code to add trailing space wasn't executed, resulting in incorrect requests to upstream.
This commit is contained in:
parent
f29eb0798b
commit
aa0b86fb4d
@ -2353,7 +2353,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
|
||||
* conf->upstream.store_lengths = NULL;
|
||||
* conf->upstream.store_values = NULL;
|
||||
*
|
||||
* conf->method = NULL;
|
||||
* conf->method = { 0, NULL };
|
||||
* conf->headers_source = NULL;
|
||||
* conf->headers_set_len = NULL;
|
||||
* conf->headers_set = NULL;
|
||||
@ -2657,10 +2657,11 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
||||
|
||||
#endif
|
||||
|
||||
if (conf->method.len == 0) {
|
||||
conf->method = prev->method;
|
||||
ngx_conf_merge_str_value(conf->method, prev->method, "");
|
||||
|
||||
} else {
|
||||
if (conf->method.len
|
||||
&& conf->method.data[conf->method.len - 1] != ' ')
|
||||
{
|
||||
conf->method.data[conf->method.len] = ' ';
|
||||
conf->method.len++;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user