technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improved HTTP version representation.

Browse Source
This commit is contained in:
Valentin Bartenev
2018-01-15 20:50:14 +03:00
parent 3fb140d6d2
commit a073616fc3
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nxt_h1proto.c
View File

@@ -254,7 +254,7 @@ nxt_h1p_header_parse(nxt_task_t *task, void *obj, void *data)
* enabled in HTTP/1.1. The mode can be overridden later by * enabled in HTTP/1.1. The mode can be overridden later by
* the "Connection" field processed in nxt_h1p_connection(). * the "Connection" field processed in nxt_h1p_connection().
*/ */
h1p->keepalive = (h1p->parser.version.str[7] != '0'); h1p->keepalive = (h1p->parser.version.s.minor != '0');
r->fields = h1p->parser.fields; r->fields = h1p->parser.fields;
@@ -658,7 +658,7 @@ nxt_h1p_request_header_send(nxt_task_t *task, nxt_http_request_t *r)
/* Trailing CRLF at the end of header. */ /* Trailing CRLF at the end of header. */
size += sizeof("\r\n") - 1; size += sizeof("\r\n") - 1;
http11 = (h1p->parser.version.str[7] != '0'); http11 = (h1p->parser.version.s.minor != '0');
if (r->resp.content_length == NULL || r->resp.content_length->skip) { if (r->resp.content_length == NULL || r->resp.content_length->skip) {
if (http11) { if (http11) {

22
src/nxt_http_parse.c
View File

@@ -169,7 +169,7 @@ nxt_http_parse_request_line(nxt_http_request_parse_t *rp, u_char **pos,
{ {
u_char *p, ch, *after_slash; u_char *p, ch, *after_slash;
nxt_int_t rc; nxt_int_t rc;
nxt_http_ver_t version; nxt_http_ver_t ver;
nxt_http_target_traps_e trap; nxt_http_target_traps_e trap;
static const nxt_http_ver_t http11 = { "HTTP/1.1" }; static const nxt_http_ver_t http11 = { "HTTP/1.1" };
@@ -383,21 +383,17 @@ space_after_target:
/* " HTTP/1.1\r\n" or " HTTP/1.1\n" */ /* " HTTP/1.1\r\n" or " HTTP/1.1\n" */
nxt_memcpy(version.str, &p[1], 8); nxt_memcpy(ver.str, &p[1], 8);
if (nxt_fast_path((version.ui64 == http11.ui64 if (nxt_fast_path((ver.ui64 == http11.ui64
|| version.ui64 == http10.ui64 || ver.ui64 == http10.ui64
|| (p[1] == 'H' || (nxt_memcmp(ver.s.prefix, "HTTP/", 5) == 0
&& p[2] == 'T' && ver.s.major >= '0' && ver.s.major <= '9'
&& p[3] == 'T' && ver.s.point == '.'
&& p[4] == 'P' && ver.s.minor >= '0' && ver.s.minor <= '9'))
&& p[5] == '/'
&& p[6] >= '0' && p[6] <= '9'
&& p[7] == '.'
&& p[8] >= '0' && p[8] <= '9'))
&& (p[9] == '\r' || p[9] == '\n'))) && (p[9] == '\r' || p[9] == '\n')))
{ {
rp->version.ui64 = version.ui64; rp->version.ui64 = ver.ui64;
if (nxt_fast_path(p[9] == '\r')) { if (nxt_fast_path(p[9] == '\r')) {
p += 10; p += 10;

7
src/nxt_http_parse.h
View File

@@ -22,6 +22,13 @@ typedef struct nxt_http_fields_hash_s nxt_http_fields_hash_t;
typedef union { typedef union {
u_char str[8]; u_char str[8];
uint64_t ui64; uint64_t ui64;
struct {
u_char prefix[5];
u_char major;
u_char point;
u_char minor;
} s;
} nxt_http_ver_t; } nxt_http_ver_t;