nginx: src/http/modules/ngx_http_headers_filter

annotate src/http/modules/ngx_http_headers_filter_module.c @ 4548:4c1e6cef1453

If we inserted "Last-Modified" in r->headers_out.headers, don't forget to set the r->headers_out.last_modified pointer to it.

author	Ruslan Ermilov <ru@nginx.com>
date	Wed, 21 Mar 2012 07:35:43 +0000
parents	2577c27cbffd
children	3cb5cf1e1439 4c3c409ed306

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4314 diff changeset	4 * Copyright (C) Nginx, Inc.
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	5 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	6
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_http.h>
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	13 typedef struct ngx_http_header_val_s ngx_http_header_val_t;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	14
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	15 typedef ngx_int_t (ngx_http_set_header_pt)(ngx_http_request_t r,
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	16 ngx_http_header_val_t hv, ngx_str_t value);
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	17
fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	18
fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	19 typedef struct {
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	20 ngx_str_t name;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	21 ngx_uint_t offset;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	22 ngx_http_set_header_pt handler;
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	23 } ngx_http_set_header_t;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	24
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	25
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	26 struct ngx_http_header_val_s {
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	27 ngx_http_complex_value_t value;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	28 ngx_str_t key;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	29 ngx_http_set_header_pt handler;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	30 ngx_uint_t offset;
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	31 };
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	32
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	33
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	34 typedef enum {
2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	35 NGX_HTTP_EXPIRES_OFF,
2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	36 NGX_HTTP_EXPIRES_EPOCH,
2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	37 NGX_HTTP_EXPIRES_MAX,
2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	38 NGX_HTTP_EXPIRES_ACCESS,
2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	39 NGX_HTTP_EXPIRES_MODIFIED,
2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	40 NGX_HTTP_EXPIRES_DAILY,
2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	41 NGX_HTTP_EXPIRES_UNSET
2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	42 } ngx_http_expires_t;
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	43
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	44
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	45 typedef struct {
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	46 ngx_http_expires_t expires;
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	47 time_t expires_time;
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	48 ngx_array_t *headers;
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	49 } ngx_http_headers_conf_t;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	50
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	51
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	52 static ngx_int_t ngx_http_set_expires(ngx_http_request_t *r,
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	53 ngx_http_headers_conf_t *conf);
1365 d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	54 static ngx_int_t ngx_http_add_cache_control(ngx_http_request_t *r,
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	55 ngx_http_header_val_t hv, ngx_str_t value);
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	56 static ngx_int_t ngx_http_add_header(ngx_http_request_t *r,
2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	57 ngx_http_header_val_t hv, ngx_str_t value);
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	58 static ngx_int_t ngx_http_set_last_modified(ngx_http_request_t *r,
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	59 ngx_http_header_val_t hv, ngx_str_t value);
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	60
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	61 static void ngx_http_headers_create_conf(ngx_conf_t cf);
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	62 static char ngx_http_headers_merge_conf(ngx_conf_t cf,
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	63 void parent, void child);
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	64 static ngx_int_t ngx_http_headers_filter_init(ngx_conf_t *cf);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	65 static char ngx_http_headers_expires(ngx_conf_t cf, ngx_command_t *cmd,
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	66 void *conf);
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	67 static char ngx_http_headers_add(ngx_conf_t cf, ngx_command_t *cmd,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	68 void *conf);
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	69
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	70
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	71 static ngx_http_set_header_t ngx_http_set_headers[] = {
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	72
1365 d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	73 { ngx_string("Cache-Control"), 0, ngx_http_add_cache_control },
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	74
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	75 { ngx_string("Last-Modified"),
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	76 offsetof(ngx_http_headers_out_t, last_modified),
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	77 ngx_http_set_last_modified },
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	78
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	79 { ngx_null_string, 0, NULL }
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	80 };
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	81
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	82
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	83 static ngx_command_t ngx_http_headers_filter_commands[] = {
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	84
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	85 { ngx_string("expires"),
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	86 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_HTTP_LIF_CONF
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	87 \|NGX_CONF_TAKE12,
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	88 ngx_http_headers_expires,
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	89 NGX_HTTP_LOC_CONF_OFFSET,
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	90 0,
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	91 NULL},
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	92
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	93 { ngx_string("add_header"),
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	94 NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_HTTP_LIF_CONF
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	95 \|NGX_CONF_TAKE2,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	96 ngx_http_headers_add,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	97 NGX_HTTP_LOC_CONF_OFFSET,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	98 0,
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	99 NULL},
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	100
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	101 ngx_null_command
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	102 };
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	103
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	104
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	105 static ngx_http_module_t ngx_http_headers_filter_module_ctx = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	106 NULL, /* preconfiguration */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	107 ngx_http_headers_filter_init, /* postconfiguration */
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	108
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	109 NULL, /* create main configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	110 NULL, /* init main configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	111
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	112 NULL, /* create server configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	113 NULL, /* merge server configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	114
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	115 ngx_http_headers_create_conf, /* create location configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	116 ngx_http_headers_merge_conf /* merge location configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	117 };
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	118
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	119
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	120 ngx_module_t ngx_http_headers_filter_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	121 NGX_MODULE_V1,
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	122 &ngx_http_headers_filter_module_ctx, /* module context */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	123 ngx_http_headers_filter_commands, /* module directives */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	124 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	125 NULL, /* init master */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	126 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	127 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	128 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	129 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	130 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	131 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	132 NGX_MODULE_V1_PADDING
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	133 };
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	134
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	135
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	136 static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	137
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	138
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	139 static ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	140 ngx_http_headers_filter(ngx_http_request_t *r)
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	141 {
1364 b7a8c9fe2337 style fix Igor Sysoev <igor@sysoev.ru> parents: 1363 diff changeset	142 ngx_str_t value;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	143 ngx_uint_t i;
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	144 ngx_http_header_val_t *h;
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	145 ngx_http_headers_conf_t *conf;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	146
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	147 conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_filter_module);
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	148
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	149 if ((conf->expires == NGX_HTTP_EXPIRES_OFF && conf->headers == NULL)
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	150 \|\| r != r->main
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 625 diff changeset	151 \|\| (r->headers_out.status != NGX_HTTP_OK
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 625 diff changeset	152 && r->headers_out.status != NGX_HTTP_NO_CONTENT
4314 4a07bad0e2c5 Allowed add_header for proxied 206 replies. Maxim Dounin <mdounin@mdounin.ru> parents: 4217 diff changeset	153 && r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 625 diff changeset	154 && r->headers_out.status != NGX_HTTP_MOVED_PERMANENTLY
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 625 diff changeset	155 && r->headers_out.status != NGX_HTTP_MOVED_TEMPORARILY
4491 d11f86a16e3b Added support for the 307 Temporary Redirect. Ruslan Ermilov <ru@nginx.com> parents: 4474 diff changeset	156 && r->headers_out.status != NGX_HTTP_SEE_OTHER
d11f86a16e3b Added support for the 307 Temporary Redirect. Ruslan Ermilov <ru@nginx.com> parents: 4474 diff changeset	157 && r->headers_out.status != NGX_HTTP_NOT_MODIFIED
d11f86a16e3b Added support for the 307 Temporary Redirect. Ruslan Ermilov <ru@nginx.com> parents: 4474 diff changeset	158 && r->headers_out.status != NGX_HTTP_TEMPORARY_REDIRECT))
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	159 {
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	160 return ngx_http_next_header_filter(r);
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	161 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	162
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	163 if (conf->expires != NGX_HTTP_EXPIRES_OFF) {
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	164 if (ngx_http_set_expires(r, conf) != NGX_OK) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	165 return NGX_ERROR;
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	166 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	167 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	168
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	169 if (conf->headers) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	170 h = conf->headers->elts;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	171 for (i = 0; i < conf->headers->nelts; i++) {
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	172
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	173 if (ngx_http_complex_value(r, &h[i].value, &value) != NGX_OK) {
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	174 return NGX_ERROR;
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	175 }
fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	176
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	177 if (h[i].handler(r, &h[i], &value) != NGX_OK) {
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	178 return NGX_ERROR;
fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	179 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	180 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	181 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	182
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	183 return ngx_http_next_header_filter(r);
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	184 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	185
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	186
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	187 static ngx_int_t
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	188 ngx_http_set_expires(ngx_http_request_t r, ngx_http_headers_conf_t conf)
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	189 {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	190 size_t len;
2163 3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	191 time_t now, expires_time, max_age;
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	192 ngx_uint_t i;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	193 ngx_table_elt_t expires, cc, **ccp;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	194
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	195 expires = r->headers_out.expires;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	196
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	197 if (expires == NULL) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	198
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	199 expires = ngx_list_push(&r->headers_out.headers);
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	200 if (expires == NULL) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	201 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	202 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	203
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	204 r->headers_out.expires = expires;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	205
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	206 expires->hash = 1;
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3405 diff changeset	207 ngx_str_set(&expires->key, "Expires");
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	208 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	209
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	210 len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	211 expires->value.len = len - 1;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	212
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	213 ccp = r->headers_out.cache_control.elts;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	214
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	215 if (ccp == NULL) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	216
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	217 if (ngx_array_init(&r->headers_out.cache_control, r->pool,
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	218 1, sizeof(ngx_table_elt_t *))
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	219 != NGX_OK)
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	220 {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	221 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	222 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	223
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	224 ccp = ngx_array_push(&r->headers_out.cache_control);
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	225 if (ccp == NULL) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	226 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	227 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	228
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	229 cc = ngx_list_push(&r->headers_out.headers);
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	230 if (cc == NULL) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	231 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	232 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	233
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	234 cc->hash = 1;
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3405 diff changeset	235 ngx_str_set(&cc->key, "Cache-Control");
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	236 *ccp = cc;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	237
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	238 } else {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	239 for (i = 1; i < r->headers_out.cache_control.nelts; i++) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	240 ccp[i]->hash = 0;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	241 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	242
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	243 cc = ccp[0];
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	244 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	245
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	246 if (conf->expires == NGX_HTTP_EXPIRES_EPOCH) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	247 expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT";
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3405 diff changeset	248 ngx_str_set(&cc->value, "no-cache");
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	249 return NGX_OK;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	250 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	251
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	252 if (conf->expires == NGX_HTTP_EXPIRES_MAX) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	253 expires->value.data = (u_char *) "Thu, 31 Dec 2037 23:55:55 GMT";
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	254 /* 10 years */
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3405 diff changeset	255 ngx_str_set(&cc->value, "max-age=315360000");
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	256 return NGX_OK;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	257 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	258
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 2013 diff changeset	259 expires->value.data = ngx_pnalloc(r->pool, len);
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	260 if (expires->value.data == NULL) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	261 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	262 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	263
4216 ecf4608c2783 Fixed "expires @00h". Maxim Dounin <mdounin@mdounin.ru> parents: 4133 diff changeset	264 if (conf->expires_time == 0 && conf->expires != NGX_HTTP_EXPIRES_DAILY) {
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	265 ngx_memcpy(expires->value.data, ngx_cached_http_time.data,
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	266 ngx_cached_http_time.len + 1);
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3405 diff changeset	267 ngx_str_set(&cc->value, "max-age=0");
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	268 return NGX_OK;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	269 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	270
2163 3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	271 now = ngx_time();
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	272
4217 ebec73b935d3 Fixed "expires @time" with unknown last modified time (ticket #32). Maxim Dounin <mdounin@mdounin.ru> parents: 4216 diff changeset	273 if (conf->expires == NGX_HTTP_EXPIRES_DAILY) {
ebec73b935d3 Fixed "expires @time" with unknown last modified time (ticket #32). Maxim Dounin <mdounin@mdounin.ru> parents: 4216 diff changeset	274 expires_time = ngx_next_time(conf->expires_time);
ebec73b935d3 Fixed "expires @time" with unknown last modified time (ticket #32). Maxim Dounin <mdounin@mdounin.ru> parents: 4216 diff changeset	275 max_age = expires_time - now;
ebec73b935d3 Fixed "expires @time" with unknown last modified time (ticket #32). Maxim Dounin <mdounin@mdounin.ru> parents: 4216 diff changeset	276
ebec73b935d3 Fixed "expires @time" with unknown last modified time (ticket #32). Maxim Dounin <mdounin@mdounin.ru> parents: 4216 diff changeset	277 } else if (conf->expires == NGX_HTTP_EXPIRES_ACCESS
ebec73b935d3 Fixed "expires @time" with unknown last modified time (ticket #32). Maxim Dounin <mdounin@mdounin.ru> parents: 4216 diff changeset	278 \|\| r->headers_out.last_modified_time == -1)
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	279 {
2163 3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	280 expires_time = now + conf->expires_time;
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	281 max_age = conf->expires_time;
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	282
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	283 } else {
2163 3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	284 expires_time = r->headers_out.last_modified_time + conf->expires_time;
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	285 max_age = expires_time - now;
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	286 }
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	287
2163 3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	288 ngx_http_time(expires->value.data, expires_time);
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	289
3405 6cc74c87c656 fix negative time in "Cache-Control" if "expires modified" sets time in the past Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	290 if (conf->expires_time < 0 \|\| max_age < 0) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3405 diff changeset	291 ngx_str_set(&cc->value, "no-cache");
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	292 return NGX_OK;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	293 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	294
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 2013 diff changeset	295 cc->value.data = ngx_pnalloc(r->pool,
2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 2013 diff changeset	296 sizeof("max-age=") + NGX_TIME_T_LEN + 1);
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	297 if (cc->value.data == NULL) {
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	298 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	299 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	300
2163 3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	301 cc->value.len = ngx_sprintf(cc->value.data, "max-age=%T", max_age)
1366 279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	302 - cc->value.data;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	303
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	304 return NGX_OK;
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	305 }
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	306
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	307
279210f24408 move "Expires" header code to a separate function Igor Sysoev <igor@sysoev.ru> parents: 1365 diff changeset	308 static ngx_int_t
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	309 ngx_http_add_header(ngx_http_request_t r, ngx_http_header_val_t hv,
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	310 ngx_str_t *value)
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	311 {
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	312 ngx_table_elt_t *h;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	313
2406 008777fa59e0 do not add header if add_header "" Igor Sysoev <igor@sysoev.ru> parents: 2164 diff changeset	314 if (value->len) {
008777fa59e0 do not add header if add_header "" Igor Sysoev <igor@sysoev.ru> parents: 2164 diff changeset	315 h = ngx_list_push(&r->headers_out.headers);
008777fa59e0 do not add header if add_header "" Igor Sysoev <igor@sysoev.ru> parents: 2164 diff changeset	316 if (h == NULL) {
008777fa59e0 do not add header if add_header "" Igor Sysoev <igor@sysoev.ru> parents: 2164 diff changeset	317 return NGX_ERROR;
008777fa59e0 do not add header if add_header "" Igor Sysoev <igor@sysoev.ru> parents: 2164 diff changeset	318 }
008777fa59e0 do not add header if add_header "" Igor Sysoev <igor@sysoev.ru> parents: 2164 diff changeset	319
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	320 h->hash = 1;
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	321 h->key = hv->key;
2406 008777fa59e0 do not add header if add_header "" Igor Sysoev <igor@sysoev.ru> parents: 2164 diff changeset	322 h->value = *value;
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	323 }
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	324
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	325 return NGX_OK;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	326 }
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	327
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	328
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	329 static ngx_int_t
1365 d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	330 ngx_http_add_cache_control(ngx_http_request_t r, ngx_http_header_val_t hv,
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	331 ngx_str_t *value)
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	332 {
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	333 ngx_table_elt_t cc, *ccp;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	334
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	335 ccp = r->headers_out.cache_control.elts;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	336
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	337 if (ccp == NULL) {
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	338
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	339 if (ngx_array_init(&r->headers_out.cache_control, r->pool,
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	340 1, sizeof(ngx_table_elt_t *))
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	341 != NGX_OK)
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	342 {
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	343 return NGX_ERROR;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	344 }
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	345 }
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	346
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	347 ccp = ngx_array_push(&r->headers_out.cache_control);
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	348 if (ccp == NULL) {
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	349 return NGX_ERROR;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	350 }
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	351
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	352 cc = ngx_list_push(&r->headers_out.headers);
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	353 if (cc == NULL) {
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	354 return NGX_ERROR;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	355 }
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	356
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	357 cc->hash = 1;
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3405 diff changeset	358 ngx_str_set(&cc->key, "Cache-Control");
1365 d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	359 cc->value = *value;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	360
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	361 *ccp = cc;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	362
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	363 return NGX_OK;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	364 }
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	365
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	366
d1dc7ef7c3ce move "Cache-Control" header code to specific handler Igor Sysoev <igor@sysoev.ru> parents: 1364 diff changeset	367 static ngx_int_t
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	368 ngx_http_set_last_modified(ngx_http_request_t r, ngx_http_header_val_t hv,
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	369 ngx_str_t *value)
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	370 {
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	371 ngx_table_elt_t h, *old;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	372
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	373 old = (ngx_table_elt_t *) ((char ) &r->headers_out + hv->offset);
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	374
1655 b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	375 r->headers_out.last_modified_time = -1;
b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	376
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	377 if (*old == NULL) {
1655 b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	378
b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	379 if (value->len == 0) {
b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	380 return NGX_OK;
b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	381 }
b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	382
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	383 h = ngx_list_push(&r->headers_out.headers);
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	384 if (h == NULL) {
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	385 return NGX_ERROR;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	386 }
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	387
4548 4c1e6cef1453 If we inserted "Last-Modified" in r->headers_out.headers, don't Ruslan Ermilov <ru@nginx.com> parents: 4547 diff changeset	388 *old = h;
4c1e6cef1453 If we inserted "Last-Modified" in r->headers_out.headers, don't Ruslan Ermilov <ru@nginx.com> parents: 4547 diff changeset	389
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	390 } else {
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	391 h = *old;
1655 b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	392
b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	393 if (value->len == 0) {
b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	394 h->hash = 0;
b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	395 return NGX_OK;
b318cdca3aac add_header last-modified "" Igor Sysoev <igor@sysoev.ru> parents: 1366 diff changeset	396 }
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	397 }
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	398
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	399 h->hash = 1;
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	400 h->key = hv->key;
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	401 h->value = *value;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	402
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	403 return NGX_OK;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	404 }
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	405
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	406
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	407 static void *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	408 ngx_http_headers_create_conf(ngx_conf_t *cf)
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	409 {
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	410 ngx_http_headers_conf_t *conf;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	411
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	412 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_headers_conf_t));
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	413 if (conf == NULL) {
2912 c7d57b539248 return NULL instead of NGX_CONF_ERROR on a create conf failure Igor Sysoev <igor@sysoev.ru> parents: 2605 diff changeset	414 return NULL;
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	415 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	416
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	417 /*
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	418 * set by ngx_pcalloc():
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	419 *
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	420 * conf->headers = NULL;
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	421 * conf->expires_time = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	422 */
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	423
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	424 conf->expires = NGX_HTTP_EXPIRES_UNSET;
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	425
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	426 return conf;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	427 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	428
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	429
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	430 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	431 ngx_http_headers_merge_conf(ngx_conf_t cf, void parent, void *child)
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	432 {
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	433 ngx_http_headers_conf_t *prev = parent;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	434 ngx_http_headers_conf_t *conf = child;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	435
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	436 if (conf->expires == NGX_HTTP_EXPIRES_UNSET) {
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	437 conf->expires = prev->expires;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	438 conf->expires_time = prev->expires_time;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	439
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	440 if (conf->expires == NGX_HTTP_EXPIRES_UNSET) {
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	441 conf->expires = NGX_HTTP_EXPIRES_OFF;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	442 }
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	443 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	444
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	445 if (conf->headers == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	446 conf->headers = prev->headers;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	447 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	448
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	449 return NGX_CONF_OK;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	450 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	451
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	452
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	453 static ngx_int_t
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	454 ngx_http_headers_filter_init(ngx_conf_t *cf)
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	455 {
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	456 ngx_http_next_header_filter = ngx_http_top_header_filter;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	457 ngx_http_top_header_filter = ngx_http_headers_filter;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	458
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	459 return NGX_OK;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	460 }
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	461
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	462
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	463 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	464 ngx_http_headers_expires(ngx_conf_t cf, ngx_command_t cmd, void *conf)
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	465 {
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	466 ngx_http_headers_conf_t *hcf = conf;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	467
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	468 ngx_uint_t minus, n;
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	469 ngx_str_t *value;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	470
4547 2577c27cbffd Minor ngx_http_headers_filter_module.c code cleanup. Ruslan Ermilov <ru@nginx.com> parents: 4491 diff changeset	471 if (hcf->expires != NGX_HTTP_EXPIRES_UNSET) {
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	472 return "is duplicate";
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	473 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	474
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	475 value = cf->args->elts;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	476
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	477 if (cf->args->nelts == 2) {
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	478
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	479 if (ngx_strcmp(value[1].data, "epoch") == 0) {
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	480 hcf->expires = NGX_HTTP_EXPIRES_EPOCH;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	481 return NGX_CONF_OK;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	482 }
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	483
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	484 if (ngx_strcmp(value[1].data, "max") == 0) {
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	485 hcf->expires = NGX_HTTP_EXPIRES_MAX;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	486 return NGX_CONF_OK;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	487 }
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	488
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	489 if (ngx_strcmp(value[1].data, "off") == 0) {
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	490 hcf->expires = NGX_HTTP_EXPIRES_OFF;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	491 return NGX_CONF_OK;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	492 }
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	493
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	494 hcf->expires = NGX_HTTP_EXPIRES_ACCESS;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	495
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	496 n = 1;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	497
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	498 } else { /* cf->args->nelts == 3 */
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	499
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	500 if (ngx_strcmp(value[1].data, "modified") != 0) {
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	501 return "invalid value";
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	502 }
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	503
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	504 hcf->expires = NGX_HTTP_EXPIRES_MODIFIED;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	505
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	506 n = 2;
729 52d1379de54e expires max Igor Sysoev <igor@sysoev.ru> parents: 709 diff changeset	507 }
52d1379de54e expires max Igor Sysoev <igor@sysoev.ru> parents: 709 diff changeset	508
2163 3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	509 if (value[n].data[0] == '@') {
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	510 value[n].data++;
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	511 value[n].len--;
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	512 minus = 0;
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	513
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	514 if (hcf->expires == NGX_HTTP_EXPIRES_MODIFIED) {
4133 59b99f217c6d Replaced "can not" with "cannot" and "could not" in a bunch of places. Ruslan Ermilov <ru@nginx.com> parents: 3516 diff changeset	515 return "daily time cannot be used with \"modified\" parameter";
2163 3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	516 }
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	517
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	518 hcf->expires = NGX_HTTP_EXPIRES_DAILY;
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	519
3e8a4d057b77 expires daily time Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	520 } else if (value[n].data[0] == '+') {
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	521 value[n].data++;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	522 value[n].len--;
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	523 minus = 0;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	524
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	525 } else if (value[n].data[0] == '-') {
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	526 value[n].data++;
4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	527 value[n].len--;
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	528 minus = 1;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	529
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	530 } else {
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	531 minus = 0;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	532 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	533
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	534 hcf->expires_time = ngx_parse_time(&value[n], 1);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	535
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	536 if (hcf->expires_time == (time_t) NGX_ERROR) {
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	537 return "invalid value";
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	538 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	539
2164 b4ffe603fa86 check daily time range Igor Sysoev <igor@sysoev.ru> parents: 2163 diff changeset	540 if (hcf->expires == NGX_HTTP_EXPIRES_DAILY
b4ffe603fa86 check daily time range Igor Sysoev <igor@sysoev.ru> parents: 2163 diff changeset	541 && hcf->expires_time > 24 * 60 * 60)
b4ffe603fa86 check daily time range Igor Sysoev <igor@sysoev.ru> parents: 2163 diff changeset	542 {
b4ffe603fa86 check daily time range Igor Sysoev <igor@sysoev.ru> parents: 2163 diff changeset	543 return "daily time value must be less than 24 hours";
b4ffe603fa86 check daily time range Igor Sysoev <igor@sysoev.ru> parents: 2163 diff changeset	544 }
b4ffe603fa86 check daily time range Igor Sysoev <igor@sysoev.ru> parents: 2163 diff changeset	545
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	546 if (minus) {
2013 4c685f02a5a0 expires modified Igor Sysoev <igor@sysoev.ru> parents: 1655 diff changeset	547 hcf->expires_time = - hcf->expires_time;
326 8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	548 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	549
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	550 return NGX_CONF_OK;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	551 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	552
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	553
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	554 static char *
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	555 ngx_http_headers_add(ngx_conf_t cf, ngx_command_t cmd, void *conf)
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	556 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	557 ngx_http_headers_conf_t *hcf = conf;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	558
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	559 ngx_str_t *value;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	560 ngx_uint_t i;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	561 ngx_http_header_val_t *hv;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	562 ngx_http_set_header_t *set;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	563 ngx_http_compile_complex_value_t ccv;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	564
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	565 value = cf->args->elts;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	566
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	567 if (hcf->headers == NULL) {
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	568 hcf->headers = ngx_array_create(cf->pool, 1,
fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	569 sizeof(ngx_http_header_val_t));
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	570 if (hcf->headers == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	571 return NGX_CONF_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	572 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	573 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	574
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	575 hv = ngx_array_push(hcf->headers);
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	576 if (hv == NULL) {
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	577 return NGX_CONF_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	578 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	579
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	580 hv->key = value[1];
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	581 hv->handler = ngx_http_add_header;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	582 hv->offset = 0;
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	583
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	584 set = ngx_http_set_headers;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	585 for (i = 0; set[i].name.len; i++) {
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	586 if (ngx_strcasecmp(value[1].data, set[i].name.data) != 0) {
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	587 continue;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	588 }
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	589
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	590 hv->offset = set[i].offset;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	591 hv->handler = set[i].handler;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	592
1363 b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	593 break;
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	594 }
b0e114fb3bdc use header specific handler in add_handler, Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	595
2605 2a301c21256a fix add_header Last-Modified "", broken in r2589 Igor Sysoev <igor@sysoev.ru> parents: 2588 diff changeset	596 if (value[2].len == 0) {
2a301c21256a fix add_header Last-Modified "", broken in r2589 Igor Sysoev <igor@sysoev.ru> parents: 2588 diff changeset	597 ngx_memzero(&hv->value, sizeof(ngx_http_complex_value_t));
2a301c21256a fix add_header Last-Modified "", broken in r2589 Igor Sysoev <igor@sysoev.ru> parents: 2588 diff changeset	598 return NGX_CONF_OK;
2a301c21256a fix add_header Last-Modified "", broken in r2589 Igor Sysoev <igor@sysoev.ru> parents: 2588 diff changeset	599 }
2a301c21256a fix add_header Last-Modified "", broken in r2589 Igor Sysoev <igor@sysoev.ru> parents: 2588 diff changeset	600
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	601 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	602
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	603 ccv.cf = cf;
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	604 ccv.value = &value[2];
a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	605 ccv.complex_value = &hv->value;
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	606
2588 a6954ce88b80 use complex values in add_header, auth_basic_user_file, Igor Sysoev <igor@sysoev.ru> parents: 2406 diff changeset	607 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
625 fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	608 return NGX_CONF_ERROR;
fbed40ce7cb4 nginx-0.3.34-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	609 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	610
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	611 return NGX_CONF_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	612 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_headers_filter_module.c @ 4548:4c1e6cef1453