IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed header creation for header_only responses in HTTP/3.

Browse Source
This commit is contained in:
Roman Arutyunyan 2020-03-19 15:03:09 +03:00
parent 31e794f0ad
commit 8ad2707d4f
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/http/ngx_http_header_filter_module.c
View File

@ -179,6 +179,22 @@ ngx_http_header_filter(ngx_http_request_t *r)
return NGX_OK; return NGX_OK;
} }
if (r->http_version < NGX_HTTP_VERSION_10) {
return NGX_OK;
}
if (r->method == NGX_HTTP_HEAD) {
r->header_only = 1;
}
if (r->headers_out.status_line.len == 0) {
if (r->headers_out.status == NGX_HTTP_NO_CONTENT
|| r->headers_out.status == NGX_HTTP_NOT_MODIFIED)
{
r->header_only = 1;
}
}
#if (NGX_HTTP_V3) #if (NGX_HTTP_V3)
if (r->http_version == NGX_HTTP_VERSION_30) { if (r->http_version == NGX_HTTP_VERSION_30) {
@ -194,14 +210,6 @@ ngx_http_header_filter(ngx_http_request_t *r)
#endif #endif
if (r->http_version < NGX_HTTP_VERSION_10) {
return NGX_OK;
}
if (r->method == NGX_HTTP_HEAD) {
r->header_only = 1;
}
if (r->headers_out.last_modified_time != -1) { if (r->headers_out.last_modified_time != -1) {
if (r->headers_out.status != NGX_HTTP_OK if (r->headers_out.status != NGX_HTTP_OK
&& r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT && r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT
@ -235,7 +243,6 @@ ngx_http_header_filter(ngx_http_request_t *r)
/* 2XX */ /* 2XX */
if (status == NGX_HTTP_NO_CONTENT) { if (status == NGX_HTTP_NO_CONTENT) {
r->header_only = 1;
ngx_str_null(&r->headers_out.content_type); ngx_str_null(&r->headers_out.content_type);
r->headers_out.last_modified_time = -1; r->headers_out.last_modified_time = -1;
r->headers_out.last_modified = NULL; r->headers_out.last_modified = NULL;
@ -252,10 +259,6 @@ ngx_http_header_filter(ngx_http_request_t *r)
{ {
/* 3XX */ /* 3XX */
if (status == NGX_HTTP_NOT_MODIFIED) {
r->header_only = 1;
}
status = status - NGX_HTTP_MOVED_PERMANENTLY + NGX_HTTP_OFF_3XX; status = status - NGX_HTTP_MOVED_PERMANENTLY + NGX_HTTP_OFF_3XX;
status_line = &ngx_http_status_lines[status]; status_line = &ngx_http_status_lines[status];
len += ngx_http_status_lines[status].len; len += ngx_http_status_lines[status].len;

26
src/http/v3/ngx_http_v3_request.c
View File

@ -259,7 +259,7 @@ ngx_http_v3_create_header(ngx_http_request_t *r)
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 create header"); ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 create header");
/* XXX support chunked body in the chunked filter */ /* XXX support chunked body in the chunked filter */
if (r->headers_out.content_length_n == -1) { if (!r->header_only && r->headers_out.content_length_n == -1) {
return NULL; return NULL;
} }
@ -310,11 +310,11 @@ ngx_http_v3_create_header(ngx_http_request_t *r)
+ ngx_http_v3_encode_prefix_int(NULL, n, 7) + n; + ngx_http_v3_encode_prefix_int(NULL, n, 7) + n;
} }
if (r->headers_out.content_length_n == 0) { if (r->headers_out.content_length_n > 0) {
len += ngx_http_v3_encode_prefix_int(NULL, 4, 6);
} else {
len += ngx_http_v3_encode_prefix_int(NULL, 4, 4) + 1 + NGX_OFF_T_LEN; len += ngx_http_v3_encode_prefix_int(NULL, 4, 4) + 1 + NGX_OFF_T_LEN;
} else if (r->headers_out.content_length_n == 0) {
len += ngx_http_v3_encode_prefix_int(NULL, 4, 6);
} }
if (r->headers_out.last_modified == NULL if (r->headers_out.last_modified == NULL
@ -454,18 +454,18 @@ ngx_http_v3_create_header(ngx_http_request_t *r)
} }
} }
if (r->headers_out.content_length_n == 0) { if (r->headers_out.content_length_n > 0) {
/* content-length: 0 */
*b->last = 0xc0;
b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 4, 6);
} else if (r->headers_out.content_length_n > 0) {
/* content-length: 0 */ /* content-length: 0 */
*b->last = 0x70; *b->last = 0x70;
b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 4, 4); b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 4, 4);
p = b->last++; p = b->last++;
b->last = ngx_sprintf(b->last, "%O", r->headers_out.content_length_n); b->last = ngx_sprintf(b->last, "%O", r->headers_out.content_length_n);
*p = b->last - p - 1; *p = b->last - p - 1;
} else if (r->headers_out.content_length_n == 0) {
/* content-length: 0 */
*b->last = 0xc0;
b->last = (u_char *) ngx_http_v3_encode_prefix_int(b->last, 4, 6);
} }
if (r->headers_out.last_modified == NULL if (r->headers_out.last_modified == NULL
@ -521,6 +521,10 @@ ngx_http_v3_create_header(ngx_http_request_t *r)
b->last = ngx_copy(b->last, header[i].value.data, header[i].value.len); b->last = ngx_copy(b->last, header[i].value.data, header[i].value.len);
} }
if (r->header_only) {
b->last_buf = 1;
}
cl = ngx_alloc_chain_link(c->pool); cl = ngx_alloc_chain_link(c->pool);
if (cl == NULL) { if (cl == NULL) {
return NULL; return NULL;