mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-09 02:42:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP/2: introduced NGX_HTTP_V2_ENCODE_* macros.

Browse Source 
No functional changes.
This commit is contained in:
Valentin Bartenev 2015-10-26 17:43:08 +03:00
parent 69e78850fe
commit 60e41c0fb1
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/http/v2/ngx_http_v2_filter_module.c
View File

@ -20,6 +20,8 @@
#define ngx_http_v2_indexed(i) (128 + (i)) #define ngx_http_v2_indexed(i) (128 + (i))
#define ngx_http_v2_inc_indexed(i) (64 + (i)) #define ngx_http_v2_inc_indexed(i) (64 + (i))
#define NGX_HTTP_V2_ENCODE_RAW 0
#define NGX_HTTP_V2_ENCODE_HUFF 0x80
#define NGX_HTTP_V2_STATUS_INDEX 8 #define NGX_HTTP_V2_STATUS_INDEX 8
#define NGX_HTTP_V2_STATUS_200_INDEX 8 #define NGX_HTTP_V2_STATUS_200_INDEX 8
@ -406,7 +408,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
} else { } else {
*b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_STATUS_INDEX); *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_STATUS_INDEX);
*b->last++ = 3; *b->last++ = NGX_HTTP_V2_ENCODE_RAW | 3;
b->last = ngx_sprintf(b->last, "%03ui", r->headers_out.status); b->last = ngx_sprintf(b->last, "%03ui", r->headers_out.status);
} }
@ -414,11 +416,11 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
*b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX); *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
if (clcf->server_tokens) { if (clcf->server_tokens) {
*b->last++ = sizeof(NGINX_VER) - 1; *b->last++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof(NGINX_VER) - 1);
b->last = ngx_cpymem(b->last, NGINX_VER, sizeof(NGINX_VER) - 1); b->last = ngx_cpymem(b->last, NGINX_VER, sizeof(NGINX_VER) - 1);
} else { } else {
*b->last++ = sizeof("nginx") - 1; *b->last++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("nginx") - 1);
b->last = ngx_cpymem(b->last, "nginx", sizeof("nginx") - 1); b->last = ngx_cpymem(b->last, "nginx", sizeof("nginx") - 1);
} }
} }
@ -437,7 +439,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
if (r->headers_out.content_type_len == r->headers_out.content_type.len if (r->headers_out.content_type_len == r->headers_out.content_type.len
&& r->headers_out.charset.len) && r->headers_out.charset.len)
{ {
*b->last = 0; *b->last = NGX_HTTP_V2_ENCODE_RAW;
b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7), b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7),
r->headers_out.content_type.len r->headers_out.content_type.len
+ sizeof("; charset=") - 1 + sizeof("; charset=") - 1
@ -460,7 +462,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
r->headers_out.content_type.data = p; r->headers_out.content_type.data = p;
} else { } else {
*b->last = 0; *b->last = NGX_HTTP_V2_ENCODE_RAW;
b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7), b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7),
r->headers_out.content_type.len); r->headers_out.content_type.len);
b->last = ngx_cpymem(b->last, r->headers_out.content_type.data, b->last = ngx_cpymem(b->last, r->headers_out.content_type.data,
@ -476,7 +478,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
p = b->last; p = b->last;
b->last = ngx_sprintf(b->last + 1, "%O", b->last = ngx_sprintf(b->last + 1, "%O",
r->headers_out.content_length_n); r->headers_out.content_length_n);
*p = (u_char) (b->last - p - 1); *p = NGX_HTTP_V2_ENCODE_RAW | (u_char) (b->last - p - 1);
} }
if (r->headers_out.last_modified == NULL if (r->headers_out.last_modified == NULL
@ -484,14 +486,15 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
{ {
*b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LAST_MODIFIED_INDEX); *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LAST_MODIFIED_INDEX);
*b->last++ = sizeof("Wed, 31 Dec 1986 18:00:00 GMT") - 1; *b->last++ = NGX_HTTP_V2_ENCODE_RAW
| (sizeof("Wed, 31 Dec 1986 18:00:00 GMT") - 1);
b->last = ngx_http_time(b->last, r->headers_out.last_modified_time); b->last = ngx_http_time(b->last, r->headers_out.last_modified_time);
} }
if (r->headers_out.location && r->headers_out.location->value.len) { if (r->headers_out.location && r->headers_out.location->value.len) {
*b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LOCATION_INDEX); *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_LOCATION_INDEX);
*b->last = 0; *b->last = NGX_HTTP_V2_ENCODE_RAW;
b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7), b->last = ngx_http_v2_write_int(b->last, ngx_http_v2_prefix(7),
r->headers_out.location->value.len); r->headers_out.location->value.len);
b->last = ngx_cpymem(b->last, r->headers_out.location->value.data, b->last = ngx_cpymem(b->last, r->headers_out.location->value.data,
@ -501,7 +504,7 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
#if (NGX_HTTP_GZIP) #if (NGX_HTTP_GZIP)
if (r->gzip_vary) { if (r->gzip_vary) {
*b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_VARY_INDEX); *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_VARY_INDEX);
*b->last++ = sizeof("Accept-Encoding") - 1; *b->last++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("Accept-Encoding") - 1);
b->last = ngx_cpymem(b->last, "Accept-Encoding", b->last = ngx_cpymem(b->last, "Accept-Encoding",
sizeof("Accept-Encoding") - 1); sizeof("Accept-Encoding") - 1);
} }
@ -558,12 +561,12 @@ ngx_http_v2_header_filter(ngx_http_request_t *r)
*p++ = 0; *p++ = 0;
*p = 0; *p = NGX_HTTP_V2_ENCODE_RAW;
p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7), header[i].key.len); p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7), header[i].key.len);
ngx_strlow(p, header[i].key.data, header[i].key.len); ngx_strlow(p, header[i].key.data, header[i].key.len);
p += header[i].key.len; p += header[i].key.len;
*p = 0; *p = NGX_HTTP_V2_ENCODE_RAW;
p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7), p = ngx_http_v2_write_int(p, ngx_http_v2_prefix(7),
header[i].value.len); header[i].value.len);
p = ngx_cpymem(p, header[i].value.data, header[i].value.len); p = ngx_cpymem(p, header[i].value.data, header[i].value.len);