Mercurial > hg > nginx
changeset 5012:bbdb172f0927
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 22 Jan 2013 12:36:00 +0000 |
parents | 2b71f6535c76 |
children | 82a3f951feb3 |
files | src/http/modules/ngx_http_proxy_module.c |
diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c Mon Jan 21 15:05:54 2013 +0000 +++ b/src/http/modules/ngx_http_proxy_module.c Tue Jan 22 12:36:00 2013 +0000 @@ -2353,7 +2353,7 @@ * 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 @@ #endif - if (conf->method.len == 0) { - conf->method = prev->method; - - } else { + ngx_conf_merge_str_value(conf->method, prev->method, ""); + + if (conf->method.len + && conf->method.data[conf->method.len - 1] != ' ') + { conf->method.data[conf->method.len] = ' '; conf->method.len++; }