Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge of r5013: 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:
Maxim Dounin 2013-02-11 15:31:10 +00:00
parent c03f5f6e9d
commit 5b114fb135
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/http/modules/ngx_http_proxy_module.c
View File

@ -2608,7 +2608,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;
@ -2907,10 +2907,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++;
}