Klaus Demo nginx / e8ef9ea
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. Maxim Dounin 9 years ago
1 changed file(s) with 6 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all
26072607 * conf->upstream.store_lengths = NULL;
26082608 * conf->upstream.store_values = NULL;
26092609 *
2610 * conf->method = NULL;
2610 * conf->method = { 0, NULL };
26112611 * conf->headers_source = NULL;
26122612 * conf->headers_set_len = NULL;
26132613 * conf->headers_set = NULL;
29062906
29072907 #endif
29082908
2909 if (conf->method.len == 0) {
2910 conf->method = prev->method;
2911
2912 } else {
2909 ngx_conf_merge_str_value(conf->method, prev->method, "");
2910
2911 if (conf->method.len
2912 && conf->method.data[conf->method.len - 1] != ' ')
2913 {
29132914 conf->method.data[conf->method.len] = ' ';
29142915 conf->method.len++;
29152916 }