IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-19 05:33:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Proxy: improved code readability.

Browse Source 
Do not assume that space character follows the method name, just pass it
explicitly.

The fuss around it has already proved to be unsafe, see bbdb172f0927 and
http://mailman.nginx.org/pipermail/nginx-ru/2013-January/049692.html for
details.
This commit is contained in:
Ruslan Ermilov 2015-11-06 15:21:51 +03:00
parent f0f7b437b9
commit 05a38c7077
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1157,25 +1157,24 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
if (u->method.len) { if (u->method.len) {
/* HEAD was changed to GET to cache response */ /* HEAD was changed to GET to cache response */
method = u->method; method = u->method;
method.len++;
} else if (plcf->method.len) { } else if (plcf->method.len) {
method = plcf->method; method = plcf->method;
} else { } else {
method = r->method_name; method = r->method_name;
method.len++;
} }
ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module); ctx = ngx_http_get_module_ctx(r, ngx_http_proxy_module);
if (method.len == 5 if (method.len == 4
&& ngx_strncasecmp(method.data, (u_char *) "HEAD ", 5) == 0) && ngx_strncasecmp(method.data, (u_char *) "HEAD", 4) == 0)
{ {
ctx->head = 1; ctx->head = 1;
} }
len = method.len + sizeof(ngx_http_proxy_version) - 1 + sizeof(CRLF) - 1; len = method.len + 1 + sizeof(ngx_http_proxy_version) - 1
+ sizeof(CRLF) - 1;
escape = 0; escape = 0;
loc_len = 0; loc_len = 0;
@ -1294,6 +1293,7 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
/* the request line */ /* the request line */
b->last = ngx_copy(b->last, method.data, method.len); b->last = ngx_copy(b->last, method.data, method.len);
*b->last++ = ' ';
u->uri.data = b->last; u->uri.data = b->last;
@ -3159,13 +3159,6 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_str_value(conf->method, prev->method, ""); 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++;
}
ngx_conf_merge_value(conf->upstream.pass_request_headers, ngx_conf_merge_value(conf->upstream.pass_request_headers,
prev->upstream.pass_request_headers, 1); prev->upstream.pass_request_headers, 1);
ngx_conf_merge_value(conf->upstream.pass_request_body, ngx_conf_merge_value(conf->upstream.pass_request_body,