aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/ngx_http_headers_filter_module.c216
1 files changed, 117 insertions, 99 deletions
diff --git a/src/http/modules/ngx_http_headers_filter_module.c b/src/http/modules/ngx_http_headers_filter_module.c
index 469cb366b..81f4eb171 100644
--- a/src/http/modules/ngx_http_headers_filter_module.c
+++ b/src/http/modules/ngx_http_headers_filter_module.c
@@ -43,6 +43,8 @@ typedef struct {
#define NGX_HTTP_EXPIRES_MAX -2147483644
+static ngx_int_t ngx_http_set_expires(ngx_http_request_t *r,
+ ngx_http_headers_conf_t *conf);
static ngx_int_t ngx_http_add_cache_control(ngx_http_request_t *r,
ngx_http_header_val_t *hv, ngx_str_t *value);
static ngx_int_t ngx_http_set_last_modified(ngx_http_request_t *r,
@@ -129,14 +131,15 @@ static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
static ngx_int_t
ngx_http_headers_filter(ngx_http_request_t *r)
{
- size_t len;
ngx_str_t value;
ngx_uint_t i;
- ngx_table_elt_t *expires, *cc, **ccp;
ngx_http_header_val_t *h;
ngx_http_headers_conf_t *conf;
- if (r != r->main
+ conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_filter_module);
+
+ if ((conf->expires == NGX_HTTP_EXPIRES_OFF && conf->headers == NULL)
+ || r != r->main
|| (r->headers_out.status != NGX_HTTP_OK
&& r->headers_out.status != NGX_HTTP_NO_CONTENT
&& r->headers_out.status != NGX_HTTP_MOVED_PERMANENTLY
@@ -146,135 +149,152 @@ ngx_http_headers_filter(ngx_http_request_t *r)
return ngx_http_next_header_filter(r);
}
- conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_filter_module);
-
if (conf->expires != NGX_HTTP_EXPIRES_OFF) {
+ if (ngx_http_set_expires(r, conf) != NGX_OK) {
+ return NGX_ERROR;
+ }
+ }
- expires = r->headers_out.expires;
+ if (conf->headers) {
+ h = conf->headers->elts;
+ for (i = 0; i < conf->headers->nelts; i++) {
- if (expires == NULL) {
+ if (h[i].lengths == NULL) {
+ value = h[i].value.value;
+
+ } else {
+ if (ngx_http_script_run(r, &value, h[i].lengths->elts, 0,
+ h[i].values->elts)
+ == NULL)
+ {
+ return NGX_ERROR;
+ }
+ }
- expires = ngx_list_push(&r->headers_out.headers);
- if (expires == NULL) {
+ if (h[i].handler(r, &h[i], &value) != NGX_OK) {
return NGX_ERROR;
}
+ }
+ }
+
+ return ngx_http_next_header_filter(r);
+}
+
+
+static ngx_int_t
+ngx_http_set_expires(ngx_http_request_t *r, ngx_http_headers_conf_t *conf)
+{
+ size_t len;
+ ngx_uint_t i;
+ ngx_table_elt_t *expires, *cc, **ccp;
+
+ expires = r->headers_out.expires;
- r->headers_out.expires = expires;
+ if (expires == NULL) {
- expires->hash = 1;
- expires->key.len = sizeof("Expires") - 1;
- expires->key.data = (u_char *) "Expires";
+ expires = ngx_list_push(&r->headers_out.headers);
+ if (expires == NULL) {
+ return NGX_ERROR;
}
- len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
- expires->value.len = len - 1;
+ r->headers_out.expires = expires;
- ccp = r->headers_out.cache_control.elts;
+ expires->hash = 1;
+ expires->key.len = sizeof("Expires") - 1;
+ expires->key.data = (u_char *) "Expires";
+ }
- if (ccp == NULL) {
+ len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
+ expires->value.len = len - 1;
- if (ngx_array_init(&r->headers_out.cache_control, r->pool,
- 1, sizeof(ngx_table_elt_t *))
- != NGX_OK)
- {
- return NGX_ERROR;
- }
+ ccp = r->headers_out.cache_control.elts;
- ccp = ngx_array_push(&r->headers_out.cache_control);
- if (ccp == NULL) {
- return NGX_ERROR;
- }
+ if (ccp == NULL) {
- cc = ngx_list_push(&r->headers_out.headers);
- if (cc == NULL) {
- return NGX_ERROR;
- }
+ if (ngx_array_init(&r->headers_out.cache_control, r->pool,
+ 1, sizeof(ngx_table_elt_t *))
+ != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
+
+ ccp = ngx_array_push(&r->headers_out.cache_control);
+ if (ccp == NULL) {
+ return NGX_ERROR;
+ }
- cc->hash = 1;
- cc->key.len = sizeof("Cache-Control") - 1;
- cc->key.data = (u_char *) "Cache-Control";
+ cc = ngx_list_push(&r->headers_out.headers);
+ if (cc == NULL) {
+ return NGX_ERROR;
+ }
- *ccp = cc;
+ cc->hash = 1;
+ cc->key.len = sizeof("Cache-Control") - 1;
+ cc->key.data = (u_char *) "Cache-Control";
- } else {
- for (i = 1; i < r->headers_out.cache_control.nelts; i++) {
- ccp[i]->hash = 0;
- }
+ *ccp = cc;
- cc = ccp[0];
+ } else {
+ for (i = 1; i < r->headers_out.cache_control.nelts; i++) {
+ ccp[i]->hash = 0;
}
- if (conf->expires == NGX_HTTP_EXPIRES_EPOCH) {
- expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT";
+ cc = ccp[0];
+ }
- cc->value.len = sizeof("no-cache") - 1;
- cc->value.data = (u_char *) "no-cache";
+ if (conf->expires == NGX_HTTP_EXPIRES_EPOCH) {
+ expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT";
- } else if (conf->expires == NGX_HTTP_EXPIRES_MAX) {
- expires->value.data = (u_char *) "Thu, 31 Dec 2037 23:55:55 GMT";
+ cc->value.len = sizeof("no-cache") - 1;
+ cc->value.data = (u_char *) "no-cache";
- /* 10 years */
- cc->value.len = sizeof("max-age=315360000") - 1;
- cc->value.data = (u_char *) "max-age=315360000";
+ return NGX_OK;
+ }
- } else {
- expires->value.data = ngx_palloc(r->pool, len);
- if (expires->value.data == NULL) {
- return NGX_ERROR;
- }
+ if (conf->expires == NGX_HTTP_EXPIRES_MAX) {
+ expires->value.data = (u_char *) "Thu, 31 Dec 2037 23:55:55 GMT";
- if (conf->expires == 0) {
- ngx_memcpy(expires->value.data, ngx_cached_http_time.data,
- ngx_cached_http_time.len + 1);
+ /* 10 years */
+ cc->value.len = sizeof("max-age=315360000") - 1;
+ cc->value.data = (u_char *) "max-age=315360000";
- cc->value.len = sizeof("max-age=0") - 1;
- cc->value.data = (u_char *) "max-age=0";
+ return NGX_OK;
+ }
- } else {
- ngx_http_time(expires->value.data, ngx_time() + conf->expires);
-
- if (conf->expires < 0) {
- cc->value.len = sizeof("no-cache") - 1;
- cc->value.data = (u_char *) "no-cache";
-
- } else {
- cc->value.data = ngx_palloc(r->pool, sizeof("max-age=")
- + NGX_TIME_T_LEN + 1);
- if (cc->value.data == NULL) {
- return NGX_ERROR;
- }
-
- cc->value.len = ngx_sprintf(cc->value.data, "max-age=%T",
- conf->expires)
- - cc->value.data;
- }
- }
- }
+ expires->value.data = ngx_palloc(r->pool, len);
+ if (expires->value.data == NULL) {
+ return NGX_ERROR;
}
- if (conf->headers) {
- h = conf->headers->elts;
- for (i = 0; i < conf->headers->nelts; i++) {
+ if (conf->expires == 0) {
+ ngx_memcpy(expires->value.data, ngx_cached_http_time.data,
+ ngx_cached_http_time.len + 1);
- if (h[i].lengths == NULL) {
- value = h[i].value.value;
+ cc->value.len = sizeof("max-age=0") - 1;
+ cc->value.data = (u_char *) "max-age=0";
- } else {
- if (ngx_http_script_run(r, &value, h[i].lengths->elts, 0,
- h[i].values->elts)
- == NULL)
- {
- return NGX_ERROR;
- }
- }
+ return NGX_OK;
+ }
- if (h[i].handler(r, &h[i], &value) != NGX_OK) {
- return NGX_ERROR;
- }
- }
+ ngx_http_time(expires->value.data, ngx_time() + conf->expires);
+
+ if (conf->expires < 0) {
+ cc->value.len = sizeof("no-cache") - 1;
+ cc->value.data = (u_char *) "no-cache";
+
+ return NGX_OK;
}
- return ngx_http_next_header_filter(r);
+ cc->value.data = ngx_palloc(r->pool,
+ sizeof("max-age=") + NGX_TIME_T_LEN + 1);
+ if (cc->value.data == NULL) {
+ return NGX_ERROR;
+ }
+
+ cc->value.len = ngx_sprintf(cc->value.data, "max-age=%T", conf->expires)
+ - cc->value.data;
+
+ return NGX_OK;
}
@@ -382,8 +402,6 @@ ngx_http_headers_create_conf(ngx_conf_t *cf)
/*
* set by ngx_pcalloc():
*
- * conf->cache_control.len = 0;
- * conf->cache_control.data = NULL;
* conf->headers = NULL;
*/
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 05:24:38 +0000