diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2015-11-06 15:22:43 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2015-11-06 15:22:43 +0300 |
| commit | 5ea66922d9c432056c4d42b2608ef1e4358b9fa4 (patch) | |
| tree | 43efdefc5b9db760bea7e495247c9639395896cc | |
| parent | bfe1987b418251f4e17665c711296ebc41ecdc38 (diff) | |
Style: unified request method checks.
| -rw-r--r-- | src/http/modules/ngx_http_chunked_filter_module.c | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_static_module.c | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_stub_status_module.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/http/modules/ngx_http_chunked_filter_module.c b/src/http/modules/ngx_http_chunked_filter_module.c index a7dc5bf4..0059a98d 100644 --- a/src/http/modules/ngx_http_chunked_filter_module.c +++ b/src/http/modules/ngx_http_chunked_filter_module.c @@ -64,7 +64,7 @@ ngx_http_chunked_header_filter(ngx_http_request_t *r) || 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); } diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c index 631eb17b..f79c4aee 100644 --- a/src/http/modules/ngx_http_static_module.c +++ b/src/http/modules/ngx_http_static_module.c @@ -204,7 +204,7 @@ ngx_http_static_handler(ngx_http_request_t *r) #endif - if (r->method & NGX_HTTP_POST) { + if (r->method == NGX_HTTP_POST) { return NGX_HTTP_NOT_ALLOWED; } diff --git a/src/http/modules/ngx_http_stub_status_module.c b/src/http/modules/ngx_http_stub_status_module.c index dd683589..61199f2f 100644 --- a/src/http/modules/ngx_http_stub_status_module.c +++ b/src/http/modules/ngx_http_stub_status_module.c @@ -89,7 +89,7 @@ ngx_http_stub_status_handler(ngx_http_request_t *r) 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; } diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index ab7c15f6..b68a13d3 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1788,7 +1788,7 @@ ngx_http_process_request_header(ngx_http_request_t *r) } } - 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); diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 8a9fbac4..c618ce6c 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -772,7 +772,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u) 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; } |