mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Style: unified request method checks.

Browse Source
This commit is contained in:
Ruslan Ermilov 2015-11-06 15:22:43 +03:00
parent bfe1987b41
commit 5ea66922d9
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_chunked_filter_module.c
View File

@ -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_NO_CONTENT
|| r->headers_out.status < NGX_HTTP_OK || r->headers_out.status < NGX_HTTP_OK
|| r != r->main || r != r->main
|| (r->method & NGX_HTTP_HEAD)) || r->method == NGX_HTTP_HEAD)
{ {
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);
} }

2
src/http/modules/ngx_http_static_module.c
View File

@ -204,7 +204,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
#endif #endif
if (r->method & NGX_HTTP_POST) { if (r->method == NGX_HTTP_POST) {
return NGX_HTTP_NOT_ALLOWED; return NGX_HTTP_NOT_ALLOWED;
} }

2
src/http/modules/ngx_http_stub_status_module.c
View File

@ -89,7 +89,7 @@ ngx_http_stub_status_handler(ngx_http_request_t *r)
ngx_chain_t out; ngx_chain_t out;
ngx_atomic_int_t ap, hn, ac, rq, rd, wr, wa; 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; return NGX_HTTP_NOT_ALLOWED;
} }

2
src/http/ngx_http_request.c
View File

@ -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, ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
"client sent TRACE method"); "client sent TRACE method");
ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED); ngx_http_finalize_request(r, NGX_HTTP_NOT_ALLOWED);

2
src/http/ngx_http_upstream.c
View File

@ -772,7 +772,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
return rc; 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; u->method = ngx_http_core_get_method;
} }