Mercurial > hg > nginx
changeset 6306:b1858fc47e3b
Style: unified request method checks.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Fri, 06 Nov 2015 15:22:43 +0300 |
parents | 18428f775b2c |
children | 2c8874c22073 |
files | src/http/modules/ngx_http_chunked_filter_module.c src/http/modules/ngx_http_static_module.c src/http/modules/ngx_http_stub_status_module.c src/http/ngx_http_request.c src/http/ngx_http_upstream.c |
diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_chunked_filter_module.c Mon Nov 23 12:40:19 2015 +0300 +++ b/src/http/modules/ngx_http_chunked_filter_module.c Fri Nov 06 15:22:43 2015 +0300 @@ -64,7 +64,7 @@ || r->headers_out.status == NGX_HTTP_NO_CONTENT || r->headers_out.status < NGX_HTTP_OK || r != r->main - || (r->method & NGX_HTTP_HEAD)) + || r->method == NGX_HTTP_HEAD) { return ngx_http_next_header_filter(r); }
--- a/src/http/modules/ngx_http_static_module.c Mon Nov 23 12:40:19 2015 +0300 +++ b/src/http/modules/ngx_http_static_module.c Fri Nov 06 15:22:43 2015 +0300 @@ -204,7 +204,7 @@ #endif - if (r->method & NGX_HTTP_POST) { + if (r->method == NGX_HTTP_POST) { return NGX_HTTP_NOT_ALLOWED; }
--- a/src/http/modules/ngx_http_stub_status_module.c Mon Nov 23 12:40:19 2015 +0300 +++ b/src/http/modules/ngx_http_stub_status_module.c Fri Nov 06 15:22:43 2015 +0300 @@ -89,7 +89,7 @@ ngx_chain_t out; ngx_atomic_int_t ap, hn, ac, rq, rd, wr, wa; - if (r->method != NGX_HTTP_GET && r->method != NGX_HTTP_HEAD) { + if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) { return NGX_HTTP_NOT_ALLOWED; }
--- a/src/http/ngx_http_request.c Mon Nov 23 12:40:19 2015 +0300 +++ b/src/http/ngx_http_request.c Fri Nov 06 15:22:43 2015 +0300 @@ -1788,7 +1788,7 @@ } } - if (r->method & NGX_HTTP_TRACE) { + if (r->method == NGX_HTTP_TRACE) { ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, "client sent TRACE method"); ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);
--- a/src/http/ngx_http_upstream.c Mon Nov 23 12:40:19 2015 +0300 +++ b/src/http/ngx_http_upstream.c Fri Nov 06 15:22:43 2015 +0300 @@ -772,7 +772,7 @@ return rc; } - if ((r->method & NGX_HTTP_HEAD) && u->conf->cache_convert_head) { + if (r->method == NGX_HTTP_HEAD && u->conf->cache_convert_head) { u->method = ngx_http_core_get_method; }