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

Slightly optimized code that handles special headers in "add_header".

Browse Source
This commit is contained in:
Ruslan Ermilov 2012-12-19 10:30:45 +00:00
parent 4bad9d0505
commit 30390ea492
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,9 @@ static ngx_http_set_header_t ngx_http_set_headers[] = {
{ ngx_string("Cache-Control"), 0, ngx_http_add_cache_control },
{ ngx_string("Last-Modified"), 0, ngx_http_set_last_modified },
{ ngx_string("Last-Modified"),
offsetof(ngx_http_headers_out_t, last_modified),
ngx_http_set_last_modified },
{ ngx_string("ETag"),
offsetof(ngx_http_headers_out_t, etag),
@ -372,27 +374,12 @@ static ngx_int_t
ngx_http_set_last_modified(ngx_http_request_t *r, ngx_http_header_val_t *hv,
ngx_str_t *value)
{
ngx_table_elt_t *h;
ngx_http_clear_last_modified(r);
if (value->len == 0) {
return NGX_OK;
}
r->headers_out.last_modified_time = ngx_http_parse_time(value->data,
value->len);
h = ngx_list_push(&r->headers_out.headers);
if (h == NULL) {
if (ngx_http_set_response_header(r, hv, value) != NGX_OK) {
return NGX_ERROR;
}
r->headers_out.last_modified = h;
h->hash = 1;
h->key = hv->key;
h->value = *value;
r->headers_out.last_modified_time =
(value->len) ? ngx_http_parse_time(value->data, value->len) : -1;
return NGX_OK;
}
@ -406,21 +393,26 @@ ngx_http_set_response_header(ngx_http_request_t *r, ngx_http_header_val_t *hv,
old = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset);
if (*old) {
(*old)->hash = 0;
*old = NULL;
}
if (value->len == 0) {
if (*old) {
(*old)->hash = 0;
*old = NULL;
}
return NGX_OK;
}
h = ngx_list_push(&r->headers_out.headers);
if (h == NULL) {
return NGX_ERROR;
}
if (*old) {
h = *old;
*old = h;
} else {
h = ngx_list_push(&r->headers_out.headers);
if (h == NULL) {
return NGX_ERROR;
}
*old = h;
}
h->hash = 1;
h->key = hv->key;