Mercurial > hg > nginx
annotate src/http/v3/ngx_http_v3_request.c @ 8405:d2759e4cc437 quic
HTTP/3: split header parser in two functions.
The first one parses pseudo-headers and is analagous to the request line
parser in HTTP/1. The second one parses regular headers and is analogous to
the header parser in HTTP/1.
Additionally, error handling of client passing malformed uri is now fixed.
| author | Roman Arutyunyan <arut@nginx.com> |
|---|---|
| date | Tue, 19 May 2020 15:29:10 +0300 |
| parents | df18ae7161b8 |
| children | 66feab03d9b7 |
| rev | line source |
|---|---|
| 8215 | 1 |
| 2 /* | |
| 3 * Copyright (C) Roman Arutyunyan | |
| 4 * Copyright (C) Nginx, Inc. | |
| 5 */ | |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 #include <ngx_http.h> | |
| 11 | |
| 12 | |
| 13 static ngx_int_t ngx_http_v3_process_pseudo_header(ngx_http_request_t *r, | |
| 14 ngx_str_t *name, ngx_str_t *value); | |
| 15 | |
| 16 | |
| 17 struct { | |
| 18 ngx_str_t name; | |
| 19 ngx_uint_t method; | |
| 20 } ngx_http_v3_methods[] = { | |
| 21 | |
| 22 { ngx_string("GET"), NGX_HTTP_GET }, | |
| 23 { ngx_string("POST"), NGX_HTTP_POST }, | |
| 24 { ngx_string("HEAD"), NGX_HTTP_HEAD }, | |
| 25 { ngx_string("OPTIONS"), NGX_HTTP_OPTIONS }, | |
| 26 { ngx_string("PROPFIND"), NGX_HTTP_PROPFIND }, | |
| 27 { ngx_string("PUT"), NGX_HTTP_PUT }, | |
| 28 { ngx_string("MKCOL"), NGX_HTTP_MKCOL }, | |
| 29 { ngx_string("DELETE"), NGX_HTTP_DELETE }, | |
| 30 { ngx_string("COPY"), NGX_HTTP_COPY }, | |
| 31 { ngx_string("MOVE"), NGX_HTTP_MOVE }, | |
| 32 { ngx_string("PROPPATCH"), NGX_HTTP_PROPPATCH }, | |
| 33 { ngx_string("LOCK"), NGX_HTTP_LOCK }, | |
| 34 { ngx_string("UNLOCK"), NGX_HTTP_UNLOCK }, | |
| 35 { ngx_string("PATCH"), NGX_HTTP_PATCH }, | |
| 36 { ngx_string("TRACE"), NGX_HTTP_TRACE } | |
| 37 }; | |
| 38 | |
| 39 | |
| 40 ngx_int_t | |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
41 ngx_http_v3_parse_request(ngx_http_request_t *r, ngx_buf_t *b) |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
42 { |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
43 size_t len; |
|
8233
1e45c02f6376
HTTP/3 $request_line variable.
Roman Arutyunyan <arut@nginx.com>
parents:
8230
diff
changeset
|
44 u_char *p; |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
45 ngx_int_t rc, n; |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
46 ngx_str_t *name, *value; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
47 ngx_connection_t *c; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
48 ngx_http_v3_parse_headers_t *st; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
49 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
50 c = r->connection; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
51 st = r->h3_parse; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
52 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
53 if (st == NULL) { |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
54 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse header"); |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
55 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
56 st = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_parse_headers_t)); |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
57 if (st == NULL) { |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
58 goto failed; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
59 } |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
60 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
61 r->h3_parse = st; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
62 } |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
63 |
|
8230
31f7c697b6d9
Fixed pointer increment while parsing HTTP/3 header.
Roman Arutyunyan <arut@nginx.com>
parents:
8226
diff
changeset
|
64 while (b->pos < b->last) { |
|
31f7c697b6d9
Fixed pointer increment while parsing HTTP/3 header.
Roman Arutyunyan <arut@nginx.com>
parents:
8226
diff
changeset
|
65 rc = ngx_http_v3_parse_headers(c, st, *b->pos++); |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
66 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
67 if (rc == NGX_ERROR) { |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
68 goto failed; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
69 } |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
70 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
71 if (rc == NGX_AGAIN) { |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
72 continue; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
73 } |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
74 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
75 name = &st->header_rep.header.name; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
76 value = &st->header_rep.header.value; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
77 |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
78 n = ngx_http_v3_process_pseudo_header(r, name, value); |
|
8233
1e45c02f6376
HTTP/3 $request_line variable.
Roman Arutyunyan <arut@nginx.com>
parents:
8230
diff
changeset
|
79 |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
80 if (n == NGX_ERROR) { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
81 goto failed; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
82 } |
|
8233
1e45c02f6376
HTTP/3 $request_line variable.
Roman Arutyunyan <arut@nginx.com>
parents:
8230
diff
changeset
|
83 |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
84 if (n == NGX_OK && rc == NGX_OK) { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
85 continue; |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
86 } |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
87 |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
88 len = (r->method_end - r->method_start) + 1 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
89 + (r->uri_end - r->uri_start) + 1 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
90 + sizeof("HTTP/3") - 1; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
91 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
92 p = ngx_pnalloc(c->pool, len); |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
93 if (p == NULL) { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
94 goto failed; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
95 } |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
96 |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
97 r->request_start = p; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
98 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
99 p = ngx_cpymem(p, r->method_start, r->method_end - r->method_start); |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
100 *p++ = ' '; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
101 p = ngx_cpymem(p, r->uri_start, r->uri_end - r->uri_start); |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
102 *p++ = ' '; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
103 p = ngx_cpymem(p, "HTTP/3", sizeof("HTTP/3") - 1); |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
104 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
105 r->request_end = p; |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
106 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
107 return NGX_OK; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
108 } |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
109 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
110 return NGX_AGAIN; |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
111 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
112 failed: |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
113 |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
114 return NGX_HTTP_PARSE_INVALID_REQUEST; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
115 } |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
116 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
117 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
118 ngx_int_t |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
119 ngx_http_v3_parse_header(ngx_http_request_t *r, ngx_buf_t *b) |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
120 { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
121 ngx_int_t rc; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
122 ngx_str_t *name, *value; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
123 ngx_connection_t *c; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
124 ngx_http_v3_parse_headers_t *st; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
125 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
126 c = r->connection; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
127 st = r->h3_parse; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
128 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
129 if (st->state == 0) { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
130 if (r->header_name_start == NULL) { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
131 name = &st->header_rep.header.name; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
132 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
133 if (name->len && name->data[0] != ':') { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
134 goto done; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
135 } |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
136 } |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
137 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
138 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
139 "http3 parse header done"); |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
140 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
141 return NGX_HTTP_PARSE_HEADER_DONE; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
142 } |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
143 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
144 while (b->pos < b->last) { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
145 rc = ngx_http_v3_parse_headers(c, st, *b->pos++); |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
146 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
147 if (rc == NGX_ERROR) { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
148 return NGX_HTTP_PARSE_INVALID_HEADER; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
149 } |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
150 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
151 if (rc != NGX_AGAIN) { |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
152 goto done; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
153 } |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
154 } |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
155 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
156 return NGX_AGAIN; |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
157 |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
158 done: |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
159 |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
160 name = &st->header_rep.header.name; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
161 value = &st->header_rep.header.value; |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
162 |
|
8405
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
163 r->header_name_start = name->data; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
164 r->header_name_end = name->data + name->len; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
165 r->header_start = value->data; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
166 r->header_end = value->data + value->len; |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
167 r->header_hash = ngx_hash_key(name->data, name->len); |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
168 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
169 /* XXX r->lowcase_index = i; */ |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
170 |
|
d2759e4cc437
HTTP/3: split header parser in two functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8394
diff
changeset
|
171 return NGX_OK; |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
172 } |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
173 |
| 8215 | 174 |
| 175 static ngx_int_t | |
| 176 ngx_http_v3_process_pseudo_header(ngx_http_request_t *r, ngx_str_t *name, | |
| 177 ngx_str_t *value) | |
| 178 { | |
| 179 ngx_uint_t i; | |
| 180 ngx_connection_t *c; | |
| 181 | |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
182 if (name->len == 0 || name->data[0] != ':') { |
|
8233
1e45c02f6376
HTTP/3 $request_line variable.
Roman Arutyunyan <arut@nginx.com>
parents:
8230
diff
changeset
|
183 return NGX_DONE; |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
184 } |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
185 |
| 8215 | 186 c = r->connection; |
| 187 | |
| 188 if (name->len == 7 && ngx_strncmp(name->data, ":method", 7) == 0) { | |
| 189 r->method_start = value->data; | |
| 190 r->method_end = value->data + value->len; | |
| 191 | |
| 192 for (i = 0; i < sizeof(ngx_http_v3_methods) | |
| 193 / sizeof(ngx_http_v3_methods[0]); i++) | |
| 194 { | |
| 195 if (value->len == ngx_http_v3_methods[i].name.len | |
| 196 && ngx_strncmp(value->data, ngx_http_v3_methods[i].name.data, | |
| 197 value->len) == 0) | |
| 198 { | |
| 199 r->method = ngx_http_v3_methods[i].method; | |
| 200 break; | |
| 201 } | |
| 202 } | |
| 203 | |
| 204 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
| 205 "http3 method \"%V\" %ui", value, r->method); | |
| 206 return NGX_OK; | |
| 207 } | |
| 208 | |
| 209 if (name->len == 5 && ngx_strncmp(name->data, ":path", 5) == 0) { | |
| 210 r->uri_start = value->data; | |
| 211 r->uri_end = value->data + value->len; | |
| 212 | |
| 213 if (ngx_http_parse_uri(r) != NGX_OK) { | |
| 214 ngx_log_error(NGX_LOG_INFO, c->log, 0, | |
| 215 "client sent invalid :path header: \"%V\"", value); | |
| 216 return NGX_ERROR; | |
| 217 } | |
| 218 | |
| 219 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
| 220 "http3 path \"%V\"", value); | |
| 221 | |
| 222 return NGX_OK; | |
| 223 } | |
| 224 | |
| 225 if (name->len == 7 && ngx_strncmp(name->data, ":scheme", 7) == 0) { | |
| 226 r->schema_start = value->data; | |
| 227 r->schema_end = value->data + value->len; | |
| 228 | |
| 229 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
| 230 "http3 schema \"%V\"", value); | |
| 231 | |
| 232 return NGX_OK; | |
| 233 } | |
| 234 | |
| 235 if (name->len == 10 && ngx_strncmp(name->data, ":authority", 10) == 0) { | |
| 236 r->host_start = value->data; | |
| 237 r->host_end = value->data + value->len; | |
| 238 | |
| 239 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
| 240 "http3 authority \"%V\"", value); | |
| 241 | |
| 242 return NGX_OK; | |
| 243 } | |
| 244 | |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
245 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
246 "http3 unknown pseudo header \"%V\" \"%V\"", name, value); |
| 8215 | 247 |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
248 return NGX_OK; |
| 8215 | 249 } |
| 250 | |
| 251 | |
|
8295
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
252 ngx_int_t |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
253 ngx_http_v3_parse_request_body(ngx_http_request_t *r, ngx_buf_t *b, |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
254 ngx_http_chunked_t *ctx) |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
255 { |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
256 ngx_int_t rc; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
257 ngx_connection_t *c; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
258 ngx_http_v3_parse_data_t *st; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
259 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
260 c = r->connection; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
261 st = ctx->h3_parse; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
262 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
263 if (st == NULL) { |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
264 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
265 "http3 parse request body"); |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
266 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
267 st = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_parse_data_t)); |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
268 if (st == NULL) { |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
269 goto failed; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
270 } |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
271 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
272 r->h3_parse = st; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
273 } |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
274 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
275 if (ctx->size) { |
|
8329
7bd334b8d91a
HTTP/3: fixed reading request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8295
diff
changeset
|
276 ctx->length = ctx->size + 1; |
|
7bd334b8d91a
HTTP/3: fixed reading request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8295
diff
changeset
|
277 return (b->pos == b->last) ? NGX_AGAIN : NGX_OK; |
|
8295
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
278 } |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
279 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
280 while (b->pos < b->last) { |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
281 rc = ngx_http_v3_parse_data(c, st, *b->pos++); |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
282 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
283 if (rc == NGX_ERROR) { |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
284 goto failed; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
285 } |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
286 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
287 if (rc == NGX_AGAIN) { |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
288 continue; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
289 } |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
290 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
291 /* rc == NGX_DONE */ |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
292 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
293 ctx->size = st->length; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
294 return NGX_OK; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
295 } |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
296 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
297 if (!b->last_buf) { |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
298 ctx->length = 1; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
299 return NGX_AGAIN; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
300 } |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
301 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
302 if (st->state) { |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
303 goto failed; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
304 } |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
305 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
306 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse header done"); |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
307 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
308 return NGX_DONE; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
309 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
310 failed: |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
311 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
312 return NGX_ERROR; |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
313 } |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
314 |
|
5649079a41f4
Parsing HTTP/3 request body.
Roman Arutyunyan <arut@nginx.com>
parents:
8292
diff
changeset
|
315 |
| 8215 | 316 ngx_chain_t * |
| 317 ngx_http_v3_create_header(ngx_http_request_t *r) | |
| 318 { | |
| 319 u_char *p; | |
|
8253
69365c7bb07f
Removed unused variable.
Roman Arutyunyan <arut@nginx.com>
parents:
8238
diff
changeset
|
320 size_t len, n; |
| 8215 | 321 ngx_buf_t *b; |
| 322 ngx_uint_t i, j; | |
| 323 ngx_chain_t *hl, *cl, *bl; | |
| 324 ngx_list_part_t *part; | |
| 325 ngx_table_elt_t *header; | |
| 326 ngx_connection_t *c; | |
| 327 ngx_http_core_loc_conf_t *clcf; | |
| 328 | |
| 329 c = r->connection; | |
| 330 | |
| 331 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 create header"); | |
| 332 | |
| 8291 | 333 len = 2; |
| 8215 | 334 |
| 335 if (r->headers_out.status == NGX_HTTP_OK) { | |
| 336 len += ngx_http_v3_encode_prefix_int(NULL, 25, 6); | |
| 337 | |
| 338 } else { | |
| 339 len += 3 + ngx_http_v3_encode_prefix_int(NULL, 25, 4) | |
| 340 + ngx_http_v3_encode_prefix_int(NULL, 3, 7); | |
| 341 } | |
| 342 | |
| 343 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); | |
| 344 | |
| 345 if (r->headers_out.server == NULL) { | |
| 346 if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) { | |
| 347 n = sizeof(NGINX_VER) - 1; | |
| 348 | |
| 349 } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) { | |
| 350 n = sizeof(NGINX_VER_BUILD) - 1; | |
| 351 | |
| 352 } else { | |
| 353 n = sizeof("nginx") - 1; | |
| 354 } | |
| 355 | |
| 356 len += ngx_http_v3_encode_prefix_int(NULL, 92, 4) | |
| 357 + ngx_http_v3_encode_prefix_int(NULL, n, 7) + n; | |
| 358 } | |
| 359 | |
| 360 if (r->headers_out.date == NULL) { | |
| 361 len += ngx_http_v3_encode_prefix_int(NULL, 6, 4) | |
| 362 + ngx_http_v3_encode_prefix_int(NULL, ngx_cached_http_time.len, | |
| 363 7) | |
| 364 + ngx_cached_http_time.len; | |
| 365 } | |
| 366 | |
| 367 if (r->headers_out.content_type.len) { | |
| 368 n = r->headers_out.content_type.len; | |
| 369 | |
| 370 if (r->headers_out.content_type_len == r->headers_out.content_type.len | |
| 371 && r->headers_out.charset.len) | |
| 372 { | |
| 373 n += sizeof("; charset=") - 1 + r->headers_out.charset.len; | |
| 374 } | |
| 375 | |
| 376 len += ngx_http_v3_encode_prefix_int(NULL, 53, 4) | |
| 377 + ngx_http_v3_encode_prefix_int(NULL, n, 7) + n; | |
| 378 } | |
| 379 | |
|
8238
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
380 if (r->headers_out.content_length_n > 0) { |
|
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
381 len += ngx_http_v3_encode_prefix_int(NULL, 4, 4) + 1 + NGX_OFF_T_LEN; |
| 8215 | 382 |
|
8238
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
383 } else if (r->headers_out.content_length_n == 0) { |
|
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
384 len += ngx_http_v3_encode_prefix_int(NULL, 4, 6); |
| 8215 | 385 } |
| 386 | |
| 387 if (r->headers_out.last_modified == NULL | |
| 388 && r->headers_out.last_modified_time != -1) | |
| 389 { | |
| 390 len += ngx_http_v3_encode_prefix_int(NULL, 10, 4) + 1 | |
| 391 + sizeof("Last-Modified: Mon, 28 Sep 1970 06:00:00 GMT"); | |
| 392 } | |
| 393 | |
| 394 /* XXX location */ | |
| 395 | |
| 396 #if (NGX_HTTP_GZIP) | |
| 397 if (r->gzip_vary) { | |
| 398 if (clcf->gzip_vary) { | |
| 399 /* Vary: Accept-Encoding */ | |
| 400 len += ngx_http_v3_encode_prefix_int(NULL, 59, 6); | |
| 401 | |
| 402 } else { | |
| 403 r->gzip_vary = 0; | |
| 404 } | |
| 405 } | |
| 406 #endif | |
| 407 | |
| 408 part = &r->headers_out.headers.part; | |
| 409 header = part->elts; | |
| 410 | |
| 411 for (i = 0; /* void */; i++) { | |
| 412 | |
| 413 if (i >= part->nelts) { | |
| 414 if (part->next == NULL) { | |
| 415 break; | |
| 416 } | |
| 417 | |
| 418 part = part->next; | |
| 419 header = part->elts; | |
| 420 i = 0; | |
| 421 } | |
| 422 | |
| 423 if (header[i].hash == 0) { | |
| 424 continue; | |
| 425 } | |
| 426 | |
| 427 len += ngx_http_v3_encode_prefix_int(NULL, header[i].key.len, 3) | |
| 428 + header[i].key.len | |
| 429 + ngx_http_v3_encode_prefix_int(NULL, header[i].value.len, 7 ) | |
| 430 + header[i].value.len; | |
| 431 } | |
| 432 | |
| 433 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 header len:%uz", len); | |
| 434 | |
| 435 b = ngx_create_temp_buf(r->pool, len); | |
| 436 if (b == NULL) { | |
| 437 return NULL; | |
| 438 } | |
| 439 | |
| 440 *b->last++ = 0; | |
| 441 *b->last++ = 0; | |
| 442 | |
| 443 if (r->headers_out.status == NGX_HTTP_OK) { | |
| 444 /* :status: 200 */ | |
| 445 *b->last = 0xc0; | |
| 446 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 25, 6); | |
| 447 | |
| 448 } else { | |
| 449 /* :status: 200 */ | |
| 450 *b->last = 0x70; | |
| 451 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 25, 4); | |
| 452 *b->last = 0; | |
| 453 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 3, 7); | |
|
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8219
diff
changeset
|
454 b->last = ngx_sprintf(b->last, "%03ui", r->headers_out.status); |
| 8215 | 455 } |
| 456 | |
| 457 if (r->headers_out.server == NULL) { | |
| 458 if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) { | |
| 459 p = (u_char *) NGINX_VER; | |
| 460 n = sizeof(NGINX_VER) - 1; | |
| 461 | |
| 462 } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) { | |
| 463 p = (u_char *) NGINX_VER_BUILD; | |
| 464 n = sizeof(NGINX_VER_BUILD) - 1; | |
| 465 | |
| 466 } else { | |
| 467 p = (u_char *) "nginx"; | |
| 468 n = sizeof("nginx") - 1; | |
| 469 } | |
| 470 | |
| 471 /* server */ | |
| 472 *b->last = 0x70; | |
| 473 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 92, 4); | |
| 474 *b->last = 0; | |
| 475 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, n, 7); | |
| 476 b->last = ngx_cpymem(b->last, p, n); | |
| 477 } | |
| 478 | |
| 479 if (r->headers_out.date == NULL) { | |
| 480 /* date */ | |
| 481 *b->last = 0x70; | |
| 482 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 6, 4); | |
| 483 *b->last = 0; | |
| 484 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, | |
| 485 ngx_cached_http_time.len, 7); | |
| 486 b->last = ngx_cpymem(b->last, ngx_cached_http_time.data, | |
| 487 ngx_cached_http_time.len); | |
| 488 } | |
| 489 | |
| 490 if (r->headers_out.content_type.len) { | |
| 491 n = r->headers_out.content_type.len; | |
| 492 | |
| 493 if (r->headers_out.content_type_len == r->headers_out.content_type.len | |
| 494 && r->headers_out.charset.len) | |
| 495 { | |
| 496 n += sizeof("; charset=") - 1 + r->headers_out.charset.len; | |
| 497 } | |
| 498 | |
| 499 /* content-type: text/plain */ | |
| 500 *b->last = 0x70; | |
| 501 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 53, 4); | |
| 502 *b->last = 0; | |
| 503 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, n, 7); | |
| 504 | |
| 505 p = b->last; | |
| 506 b->last = ngx_copy(b->last, r->headers_out.content_type.data, | |
| 507 r->headers_out.content_type.len); | |
| 508 | |
| 509 if (r->headers_out.content_type_len == r->headers_out.content_type.len | |
| 510 && r->headers_out.charset.len) | |
| 511 { | |
| 512 b->last = ngx_cpymem(b->last, "; charset=", | |
| 513 sizeof("; charset=") - 1); | |
| 514 b->last = ngx_copy(b->last, r->headers_out.charset.data, | |
| 515 r->headers_out.charset.len); | |
| 516 | |
| 517 /* update r->headers_out.content_type for possible logging */ | |
| 518 | |
| 519 r->headers_out.content_type.len = b->last - p; | |
| 520 r->headers_out.content_type.data = p; | |
| 521 } | |
| 522 } | |
| 523 | |
|
8238
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
524 if (r->headers_out.content_length_n > 0) { |
| 8215 | 525 /* content-length: 0 */ |
| 526 *b->last = 0x70; | |
| 527 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 4, 4); | |
| 528 p = b->last++; | |
| 529 b->last = ngx_sprintf(b->last, "%O", r->headers_out.content_length_n); | |
| 530 *p = b->last - p - 1; | |
|
8238
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
531 |
|
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
532 } else if (r->headers_out.content_length_n == 0) { |
|
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
533 /* content-length: 0 */ |
|
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
534 *b->last = 0xc0; |
|
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
535 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 4, 6); |
| 8215 | 536 } |
| 537 | |
| 538 if (r->headers_out.last_modified == NULL | |
| 539 && r->headers_out.last_modified_time != -1) | |
| 540 { | |
| 541 /* last-modified */ | |
| 542 *b->last = 0x70; | |
| 543 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 10, 4); | |
| 544 p = b->last++; | |
| 545 b->last = ngx_http_time(b->last, r->headers_out.last_modified_time); | |
| 546 *p = b->last - p - 1; | |
| 547 } | |
| 548 | |
| 549 #if (NGX_HTTP_GZIP) | |
| 550 if (r->gzip_vary) { | |
| 551 /* vary: accept-encoding */ | |
| 552 *b->last = 0xc0; | |
| 553 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 59, 6); | |
| 554 } | |
| 555 #endif | |
| 556 | |
| 557 part = &r->headers_out.headers.part; | |
| 558 header = part->elts; | |
| 559 | |
| 560 for (i = 0; /* void */; i++) { | |
| 561 | |
| 562 if (i >= part->nelts) { | |
| 563 if (part->next == NULL) { | |
| 564 break; | |
| 565 } | |
| 566 | |
| 567 part = part->next; | |
| 568 header = part->elts; | |
| 569 i = 0; | |
| 570 } | |
| 571 | |
| 572 if (header[i].hash == 0) { | |
| 573 continue; | |
| 574 } | |
| 575 | |
| 576 *b->last = 0x30; | |
| 577 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, | |
| 578 header[i].key.len, | |
| 579 3); | |
| 580 for (j = 0; j < header[i].key.len; j++) { | |
| 581 *b->last++ = ngx_tolower(header[i].key.data[j]); | |
| 582 } | |
| 583 | |
| 584 *b->last = 0; | |
| 585 b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, | |
| 586 header[i].value.len, | |
| 587 7); | |
| 588 b->last = ngx_copy(b->last, header[i].value.data, header[i].value.len); | |
| 589 } | |
| 590 | |
|
8238
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
591 if (r->header_only) { |
|
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
592 b->last_buf = 1; |
|
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
593 } |
|
a3257a725b3d
Fixed header creation for header_only responses in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8233
diff
changeset
|
594 |
| 8215 | 595 cl = ngx_alloc_chain_link(c->pool); |
| 596 if (cl == NULL) { | |
| 597 return NULL; | |
| 598 } | |
| 599 | |
| 600 cl->buf = b; | |
| 601 cl->next = NULL; | |
| 602 | |
| 603 n = b->last - b->pos; | |
| 604 | |
| 605 len = 1 + ngx_http_v3_encode_varlen_int(NULL, n); | |
| 606 | |
| 607 b = ngx_create_temp_buf(c->pool, len); | |
| 608 if (b == NULL) { | |
| 609 return NULL; | |
| 610 } | |
| 611 | |
| 612 *b->last++ = NGX_HTTP_V3_FRAME_HEADERS; | |
| 613 b->last = (u_char *) ngx_http_v3_encode_varlen_int(b->last, n); | |
| 614 | |
| 615 hl = ngx_alloc_chain_link(c->pool); | |
| 616 if (hl == NULL) { | |
| 617 return NULL; | |
| 618 } | |
| 619 | |
| 620 hl->buf = b; | |
| 621 hl->next = cl; | |
| 622 | |
| 623 if (r->headers_out.content_length_n >= 0) { | |
| 624 len = 1 + ngx_http_v3_encode_varlen_int(NULL, | |
| 625 r->headers_out.content_length_n); | |
| 626 | |
| 627 b = ngx_create_temp_buf(c->pool, len); | |
| 628 if (b == NULL) { | |
| 8394 | 629 return NULL; |
| 8215 | 630 } |
| 631 | |
| 632 *b->last++ = NGX_HTTP_V3_FRAME_DATA; | |
| 633 b->last = (u_char *) ngx_http_v3_encode_varlen_int(b->last, | |
| 634 r->headers_out.content_length_n); | |
| 635 | |
| 636 bl = ngx_alloc_chain_link(c->pool); | |
| 637 if (bl == NULL) { | |
| 638 return NULL; | |
| 639 } | |
| 640 | |
| 641 bl->buf = b; | |
| 642 bl->next = NULL; | |
| 643 cl->next = bl; | |
| 644 } | |
| 645 | |
| 646 return hl; | |
| 647 } | |
|
8292
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
648 |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
649 |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
650 ngx_chain_t * |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
651 ngx_http_v3_create_trailers(ngx_http_request_t *r) |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
652 { |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
653 ngx_buf_t *b; |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
654 ngx_chain_t *cl; |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
655 |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
656 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
657 "http3 create trailers"); |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
658 |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
659 /* XXX */ |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
660 |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
661 b = ngx_calloc_buf(r->pool); |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
662 if (b == NULL) { |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
663 return NULL; |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
664 } |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
665 |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
666 b->last_buf = 1; |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
667 |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
668 cl = ngx_alloc_chain_link(r->pool); |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
669 if (cl == NULL) { |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
670 return NULL; |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
671 } |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
672 |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
673 cl->buf = b; |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
674 cl->next = NULL; |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
675 |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
676 return cl; |
|
46e3542d51b3
Chunked response body in HTTP/3.
Roman Arutyunyan <arut@nginx.com>
parents:
8291
diff
changeset
|
677 } |