Mercurial > hg > nginx
changeset 7216:aa60f5799a4c
HTTP/2: style.
Unified the style of validity checks in ngx_http_v2_validate_header().
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 22 Feb 2018 12:42:29 +0300 |
parents | 2dc837d16099 |
children | 8b70d4caa505 |
files | src/http/v2/ngx_http_v2.c |
diffstat | 1 files changed, 4 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/v2/ngx_http_v2.c +++ b/src/http/v2/ngx_http_v2.c @@ -3257,19 +3257,9 @@ ngx_http_v2_validate_header(ngx_http_req continue; } - switch (ch) { - case '\0': - case LF: - case CR: - case ':': - ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, - "client sent invalid header name: \"%V\"", - &header->name); - - return NGX_ERROR; - } - - if (ch >= 'A' && ch <= 'Z') { + if (ch == '\0' || ch == LF || ch == CR || ch == ':' + || (ch >= 'A' && ch <= 'Z')) + { ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, "client sent invalid header name: \"%V\"", &header->name); @@ -3283,10 +3273,7 @@ ngx_http_v2_validate_header(ngx_http_req for (i = 0; i != header->value.len; i++) { ch = header->value.data[i]; - switch (ch) { - case '\0': - case LF: - case CR: + if (ch == '\0' || ch == LF || ch == CR) { ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, "client sent header \"%V\" with " "invalid value: \"%V\"",