Author: mdounin
Date: 2013-01-22 12:36:00 +0000 (Tue, 22 Jan 2013)
New Revision: 5013
URL: http://trac.nginx.org/nginx/changeset/5013/nginx
Log:
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.
Modified:
trunk/src/http/modules/ngx_http_proxy_module.c
Modified: trunk/src/http/modules/ngx_http_proxy_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_proxy_module.c 2013-01-21 15:05:54 UTC
(rev 5012)
+++ trunk/src/http/modules/ngx_http_proxy_module.c 2013-01-22 12:36:00 UTC
(rev 5013)
@@ -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;
+ 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++;
}
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
