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

Basic support of the Link response header.

Browse Source
This commit is contained in:
Ruslan Ermilov 2018-02-08 09:54:18 +03:00
parent d31d547dba
commit 8590d9d615
4 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/http/modules/ngx_http_headers_filter_module.c
View File

@ -56,7 +56,7 @@ static ngx_int_t ngx_http_set_expires(ngx_http_request_t *r,
ngx_http_headers_conf_t *conf); ngx_http_headers_conf_t *conf);
static ngx_int_t ngx_http_parse_expires(ngx_str_t *value, static ngx_int_t ngx_http_parse_expires(ngx_str_t *value,
ngx_http_expires_t *expires, time_t *expires_time, char **err); ngx_http_expires_t *expires, time_t *expires_time, char **err);
static ngx_int_t ngx_http_add_cache_control(ngx_http_request_t *r, static ngx_int_t ngx_http_add_multi_header_lines(ngx_http_request_t *r,
ngx_http_header_val_t *hv, ngx_str_t *value); ngx_http_header_val_t *hv, ngx_str_t *value);
static ngx_int_t ngx_http_add_header(ngx_http_request_t *r, static ngx_int_t ngx_http_add_header(ngx_http_request_t *r,
ngx_http_header_val_t *hv, ngx_str_t *value); ngx_http_header_val_t *hv, ngx_str_t *value);
@ -77,7 +77,13 @@ static char *ngx_http_headers_add(ngx_conf_t *cf, ngx_command_t *cmd,
static ngx_http_set_header_t ngx_http_set_headers[] = { static ngx_http_set_header_t ngx_http_set_headers[] = {
{ ngx_string("Cache-Control"), 0, ngx_http_add_cache_control }, { ngx_string("Cache-Control"),
offsetof(ngx_http_headers_out_t, cache_control),
ngx_http_add_multi_header_lines },
{ ngx_string("Link"),
offsetof(ngx_http_headers_out_t, link),
ngx_http_add_multi_header_lines },
{ ngx_string("Last-Modified"), { ngx_string("Last-Modified"),
offsetof(ngx_http_headers_out_t, last_modified), offsetof(ngx_http_headers_out_t, last_modified),
@ -555,42 +561,40 @@ ngx_http_add_header(ngx_http_request_t *r, ngx_http_header_val_t *hv,
static ngx_int_t static ngx_int_t
ngx_http_add_cache_control(ngx_http_request_t *r, ngx_http_header_val_t *hv, ngx_http_add_multi_header_lines(ngx_http_request_t *r,
ngx_str_t *value) ngx_http_header_val_t *hv, ngx_str_t *value)
{ {
ngx_table_elt_t *cc, **ccp; ngx_array_t *pa;
ngx_table_elt_t *h, **ph;
if (value->len == 0) { if (value->len == 0) {
return NGX_OK; return NGX_OK;
} }
ccp = r->headers_out.cache_control.elts; pa = (ngx_array_t *) ((char *) &r->headers_out + hv->offset);
if (ccp == NULL) { if (pa->elts == NULL) {
if (ngx_array_init(pa, r->pool, 1, sizeof(ngx_table_elt_t *)) != NGX_OK)
if (ngx_array_init(&r->headers_out.cache_control, r->pool,
1, sizeof(ngx_table_elt_t *))
!= NGX_OK)
{ {
return NGX_ERROR; return NGX_ERROR;
} }
} }
cc = ngx_list_push(&r->headers_out.headers); h = ngx_list_push(&r->headers_out.headers);
if (cc == NULL) { if (h == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
cc->hash = 1; h->hash = 1;
ngx_str_set(&cc->key, "Cache-Control"); h->key = hv->key;
cc->value = *value; h->value = *value;
ccp = ngx_array_push(&r->headers_out.cache_control); ph = ngx_array_push(pa);
if (ccp == NULL) { if (ph == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
*ccp = cc; *ph = h;
return NGX_OK; return NGX_OK;
} }

1
src/http/ngx_http_request.h
View File

@ -279,6 +279,7 @@ typedef struct {
ngx_uint_t content_type_hash; ngx_uint_t content_type_hash;
ngx_array_t cache_control; ngx_array_t cache_control;
ngx_array_t link;
off_t content_length_n; off_t content_length_n;
off_t content_offset; off_t content_offset;

5
src/http/ngx_http_upstream.c
View File

@ -284,6 +284,11 @@ static ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = {
ngx_http_upstream_process_vary, 0, ngx_http_upstream_process_vary, 0,
ngx_http_upstream_copy_header_line, 0, 0 }, ngx_http_upstream_copy_header_line, 0, 0 },
{ ngx_string("Link"),
ngx_http_upstream_ignore_header_line, 0,
ngx_http_upstream_copy_multi_header_lines,
offsetof(ngx_http_headers_out_t, link), 0 },
{ ngx_string("X-Accel-Expires"), { ngx_string("X-Accel-Expires"),
ngx_http_upstream_process_accel_expires, 0, ngx_http_upstream_process_accel_expires, 0,
ngx_http_upstream_copy_header_line, 0, 0 }, ngx_http_upstream_copy_header_line, 0, 0 },

3
src/http/ngx_http_variables.c
View File

@ -318,6 +318,9 @@ static ngx_http_variable_t ngx_http_core_variables[] = {
{ ngx_string("sent_http_cache_control"), NULL, ngx_http_variable_headers, { ngx_string("sent_http_cache_control"), NULL, ngx_http_variable_headers,
offsetof(ngx_http_request_t, headers_out.cache_control), 0, 0 }, offsetof(ngx_http_request_t, headers_out.cache_control), 0, 0 },
{ ngx_string("sent_http_link"), NULL, ngx_http_variable_headers,
offsetof(ngx_http_request_t, headers_out.link), 0, 0 },
{ ngx_string("limit_rate"), ngx_http_variable_request_set_size, { ngx_string("limit_rate"), ngx_http_variable_request_set_size,
ngx_http_variable_request_get_size, ngx_http_variable_request_get_size,
offsetof(ngx_http_request_t, limit_rate), offsetof(ngx_http_request_t, limit_rate),