Mercurial > hg > nginx

annotate src/http/modules/ngx_http_headers_filter_module.c @ 4216:ecf4608c2783

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed "expires @00h".
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 17 Oct 2011 17:30:18 +0000
parents 59b99f217c6d
children ebec73b935d3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
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
4 */
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
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
6
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
7 #include <ngx_config.h>
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
8 #include <ngx_core.h>
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
9 #include <ngx_http.h>
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
10
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
11
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
12 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
13
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
14 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
15 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
16
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 typedef struct {
2588
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
19 ngx_str_t name;
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
20 ngx_uint_t offset;
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
21 ngx_http_set_header_pt handler;
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
22 } ngx_http_set_header_t;
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
23
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 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
26 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
27 ngx_uint_t hash;
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
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
34 #define NGX_HTTP_EXPIRES_OFF 0
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
35 #define NGX_HTTP_EXPIRES_EPOCH 1
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
36 #define NGX_HTTP_EXPIRES_MAX 2
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
37 #define NGX_HTTP_EXPIRES_ACCESS 3
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
38 #define NGX_HTTP_EXPIRES_MODIFIED 4
2163
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
39 #define NGX_HTTP_EXPIRES_DAILY 5
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
40
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
41
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
42 typedef struct {
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
43 ngx_uint_t expires;
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
44 time_t expires_time;
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
45 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
46 } 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
47
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
48
1366
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
49 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
50 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
51 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
52 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
53 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
54 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
55
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
56 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
57 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
58 void *parent, void *child);
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
59 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
60 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
61 void *conf);
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
62 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
63 void *conf);
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
64
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
65
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
66 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
67
1365
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
68 { 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
69
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
70 { ngx_string("Last-Modified"),
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
71 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
72 ngx_http_set_last_modified },
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
73
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
74 { ngx_null_string, 0, NULL }
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
75 };
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
76
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
77
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
78 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
79
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
80 { ngx_string("expires"),
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
81 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
82 |NGX_CONF_TAKE12,
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
83 ngx_http_headers_expires,
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
84 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
85 0,
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
86 NULL},
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
87
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
88 { ngx_string("add_header"),
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
89 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
90 |NGX_CONF_TAKE2,
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
91 ngx_http_headers_add,
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
92 NGX_HTTP_LOC_CONF_OFFSET,
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
93 0,
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
94 NULL},
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
95
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
96 ngx_null_command
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
97 };
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
98
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
99
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
100 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
101 NULL, /* preconfiguration */
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
102 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
103
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
104 NULL, /* create main configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
105 NULL, /* init main configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
106
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
107 NULL, /* create server configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
108 NULL, /* merge server configuration */
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
109
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
110 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
111 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
112 };
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
113
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_module_t ngx_http_headers_filter_module = {
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
116 NGX_MODULE_V1,
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
117 &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
118 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
119 NGX_HTTP_MODULE, /* module type */
541
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 537
diff changeset
120 NULL, /* init master */
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
121 NULL, /* init module */
541
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 537
diff changeset
122 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 537
diff changeset
123 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 537
diff changeset
124 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 537
diff changeset
125 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 537
diff changeset
126 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 537
diff changeset
127 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
128 };
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
129
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
130
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
131 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
132
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
133
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
134 static ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
135 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
136 {
1364
b7a8c9fe2337 style fix
Igor Sysoev <igor@sysoev.ru>
parents: 1363
diff changeset
137 ngx_str_t value;
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
138 ngx_uint_t i;
625
fbed40ce7cb4 nginx-0.3.34-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 597
diff changeset
139 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
140 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
141
1366
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
142 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
143
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
144 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
145 || r != r->main
663
6d5c1535bb9d nginx-0.3.53-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 625
diff changeset
146 || (r->headers_out.status != NGX_HTTP_OK
6d5c1535bb9d nginx-0.3.53-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 625
diff changeset
147 && r->headers_out.status != NGX_HTTP_NO_CONTENT
6d5c1535bb9d nginx-0.3.53-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 625
diff changeset
148 && r->headers_out.status != NGX_HTTP_MOVED_PERMANENTLY
6d5c1535bb9d nginx-0.3.53-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 625
diff changeset
149 && r->headers_out.status != NGX_HTTP_MOVED_TEMPORARILY
6d5c1535bb9d nginx-0.3.53-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 625
diff changeset
150 && r->headers_out.status != NGX_HTTP_NOT_MODIFIED))
543
511a89da35ad nginx-0.2.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 541
diff changeset
151 {
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
152 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
153 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
154
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
155 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
156 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
157 return NGX_ERROR;
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
158 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
159 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
160
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
161 if (conf->headers) {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
162 h = conf->headers->elts;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
163 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
164
2588
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
165 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
166 return NGX_ERROR;
625
fbed40ce7cb4 nginx-0.3.34-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 597
diff changeset
167 }
fbed40ce7cb4 nginx-0.3.34-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 597
diff changeset
168
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
169 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
170 return NGX_ERROR;
fbed40ce7cb4 nginx-0.3.34-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 597
diff changeset
171 }
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
172 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
173 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
174
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
175 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
176 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
177
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
178
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
179 static ngx_int_t
1366
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
180 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
181 {
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
182 size_t len;
2163
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
183 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
184 ngx_uint_t i;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
185 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
186
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
187 expires = r->headers_out.expires;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
188
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
189 if (expires == NULL) {
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
190
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
191 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
192 if (expires == NULL) {
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
193 return NGX_ERROR;
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
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
196 r->headers_out.expires = expires;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
197
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
198 expires->hash = 1;
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3405
diff changeset
199 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
200 }
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
201
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
202 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
203 expires->value.len = len - 1;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
204
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
205 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
206
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
207 if (ccp == NULL) {
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 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
210 1, sizeof(ngx_table_elt_t *))
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
211 != NGX_OK)
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 return NGX_ERROR;
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
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
216 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
217 if (ccp == NULL) {
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
218 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
219 }
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 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
222 if (cc == NULL) {
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
223 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
224 }
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
225
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
226 cc->hash = 1;
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3405
diff changeset
227 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
228 *ccp = cc;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
229
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
230 } else {
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
231 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
232 ccp[i]->hash = 0;
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
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
235 cc = ccp[0];
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
236 }
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 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
239 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
240 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
241 return NGX_OK;
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
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
244 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
245 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
246 /* 10 years */
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3405
diff changeset
247 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
248 return NGX_OK;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
249 }
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
250
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 2013
diff changeset
251 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
252 if (expires->value.data == NULL) {
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
253 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
254 }
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
255
4216
ecf4608c2783 Fixed "expires @00h".
Maxim Dounin <mdounin@mdounin.ru>
parents: 4133
diff changeset
256 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
257 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
258 ngx_cached_http_time.len + 1);
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3405
diff changeset
259 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
260 return NGX_OK;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
261 }
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
262
2163
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
263 now = ngx_time();
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
264
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
265 if (conf->expires == NGX_HTTP_EXPIRES_ACCESS
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
266 || r->headers_out.last_modified_time == -1)
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
267 {
2163
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
268 expires_time = now + conf->expires_time;
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
269 max_age = conf->expires_time;
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
270
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
271 } else if (conf->expires == NGX_HTTP_EXPIRES_DAILY) {
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
272 expires_time = ngx_next_time(conf->expires_time);
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
273 max_age = expires_time - now;
1366
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
274
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
275 } else {
2163
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
276 expires_time = r->headers_out.last_modified_time + conf->expires_time;
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
277 max_age = expires_time - now;
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
278 }
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 ngx_http_time(expires->value.data, expires_time);
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
281
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
282 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
283 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
284 return NGX_OK;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
285 }
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
286
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 2013
diff changeset
287 cc->value.data = ngx_pnalloc(r->pool,
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 2013
diff changeset
288 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
289 if (cc->value.data == NULL) {
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
290 return NGX_ERROR;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
291 }
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
292
2163
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
293 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
294 - cc->value.data;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
295
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
296 return NGX_OK;
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
297 }
279210f24408 move "Expires" header code to a separate function
Igor Sysoev <igor@sysoev.ru>
parents: 1365
diff changeset
298
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 static ngx_int_t
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
301 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
302 ngx_str_t *value)
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
303 {
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
304 ngx_table_elt_t *h;
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
305
2406
008777fa59e0 do not add header if add_header ""
Igor Sysoev <igor@sysoev.ru>
parents: 2164
diff changeset
306 if (value->len) {
008777fa59e0 do not add header if add_header ""
Igor Sysoev <igor@sysoev.ru>
parents: 2164
diff changeset
307 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
308 if (h == NULL) {
008777fa59e0 do not add header if add_header ""
Igor Sysoev <igor@sysoev.ru>
parents: 2164
diff changeset
309 return NGX_ERROR;
008777fa59e0 do not add header if add_header ""
Igor Sysoev <igor@sysoev.ru>
parents: 2164
diff changeset
310 }
008777fa59e0 do not add header if add_header ""
Igor Sysoev <igor@sysoev.ru>
parents: 2164
diff changeset
311
2588
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
312 h->hash = hv->hash;
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
313 h->key = hv->key;
2406
008777fa59e0 do not add header if add_header ""
Igor Sysoev <igor@sysoev.ru>
parents: 2164
diff changeset
314 h->value = *value;
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
315 }
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
316
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
317 return NGX_OK;
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
318 }
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
319
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
320
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
321 static ngx_int_t
1365
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
322 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
323 ngx_str_t *value)
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
324 {
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
325 ngx_table_elt_t *cc, **ccp;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
326
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
327 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
328
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
329 if (ccp == NULL) {
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
330
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
331 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
332 1, sizeof(ngx_table_elt_t *))
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
333 != NGX_OK)
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 return NGX_ERROR;
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 }
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 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
340 if (ccp == NULL) {
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
341 return NGX_ERROR;
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
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
344 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
345 if (cc == NULL) {
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
346 return NGX_ERROR;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
347 }
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
348
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
349 cc->hash = 1;
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3405
diff changeset
350 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
351 cc->value = *value;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
352
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
353 *ccp = cc;
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
354
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
355 return NGX_OK;
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
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
358
d1dc7ef7c3ce move "Cache-Control" header code to specific handler
Igor Sysoev <igor@sysoev.ru>
parents: 1364
diff changeset
359 static ngx_int_t
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
360 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
361 ngx_str_t *value)
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
362 {
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
363 ngx_table_elt_t *h, **old;
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
364
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
365 if (hv->offset) {
1364
b7a8c9fe2337 style fix
Igor Sysoev <igor@sysoev.ru>
parents: 1363
diff changeset
366 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
367
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
368 } else {
1364
b7a8c9fe2337 style fix
Igor Sysoev <igor@sysoev.ru>
parents: 1363
diff changeset
369 old = NULL;
1363
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
1655
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
372 r->headers_out.last_modified_time = -1;
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
373
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
374 if (old == NULL || *old == NULL) {
1655
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
375
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
376 if (value->len == 0) {
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
377 return NGX_OK;
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
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
380 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
381 if (h == NULL) {
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
382 return NGX_ERROR;
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
383 }
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
384
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
385 } else {
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
386 h = *old;
1655
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
387
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
388 if (value->len == 0) {
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
389 h->hash = 0;
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
390 return NGX_OK;
b318cdca3aac add_header last-modified ""
Igor Sysoev <igor@sysoev.ru>
parents: 1366
diff changeset
391 }
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
392 }
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
393
2588
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
394 h->hash = hv->hash;
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
395 h->key = hv->key;
1363
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
396 h->value = *value;
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 return NGX_OK;
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
399 }
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
400
b0e114fb3bdc use header specific handler in add_handler,
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
401
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
402 static void *
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
403 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
404 {
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
405 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
406
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
407 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
408 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
409 return NULL;
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
410 }
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 /*
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
413 * set by ngx_pcalloc():
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
414 *
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
415 * conf->headers = NULL;
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
416 * conf->expires_time = 0;
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
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
419 conf->expires = NGX_CONF_UNSET_UINT;
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
420
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
421 return conf;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
422 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
423
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
424
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
425 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
426 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
427 {
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
428 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
429 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
430
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
431 if (conf->expires == NGX_CONF_UNSET_UINT) {
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
432 conf->expires = prev->expires;
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
433 conf->expires_time = prev->expires_time;
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
434
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
435 if (conf->expires == NGX_CONF_UNSET_UINT) {
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
436 conf->expires = NGX_HTTP_EXPIRES_OFF;
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
437 }
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
438 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
439
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
440 if (conf->headers == NULL) {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
441 conf->headers = prev->headers;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
442 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
443
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
444 return NGX_CONF_OK;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
445 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
446
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
447
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
448 static ngx_int_t
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
449 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
450 {
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
451 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
452 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
453
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
454 return NGX_OK;
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
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
457
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
458 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
459 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
460 {
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
461 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
462
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
463 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
464 ngx_str_t *value;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
465
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
466 if (hcf->expires != NGX_CONF_UNSET_UINT) {
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
467 return "is duplicate";
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
468 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
469
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
470 value = cf->args->elts;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
471
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
472 if (cf->args->nelts == 2) {
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
473
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
474 if (ngx_strcmp(value[1].data, "epoch") == 0) {
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
475 hcf->expires = NGX_HTTP_EXPIRES_EPOCH;
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
476 return NGX_CONF_OK;
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
477 }
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, "max") == 0) {
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
480 hcf->expires = NGX_HTTP_EXPIRES_MAX;
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 }
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
483
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
484 if (ngx_strcmp(value[1].data, "off") == 0) {
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
485 hcf->expires = NGX_HTTP_EXPIRES_OFF;
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 }
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
488
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
489 hcf->expires = NGX_HTTP_EXPIRES_ACCESS;
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
490
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
491 n = 1;
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 } else { /* cf->args->nelts == 3 */
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
494
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
495 if (ngx_strcmp(value[1].data, "modified") != 0) {
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
496 return "invalid value";
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
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
499 hcf->expires = NGX_HTTP_EXPIRES_MODIFIED;
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
500
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
501 n = 2;
729
52d1379de54e expires max
Igor Sysoev <igor@sysoev.ru>
parents: 709
diff changeset
502 }
52d1379de54e expires max
Igor Sysoev <igor@sysoev.ru>
parents: 709
diff changeset
503
2163
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
504 if (value[n].data[0] == '@') {
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
505 value[n].data++;
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
506 value[n].len--;
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
507 minus = 0;
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
508
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
509 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
510 return "daily time cannot be used with \"modified\" parameter";
2163
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
511 }
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
512
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
513 hcf->expires = NGX_HTTP_EXPIRES_DAILY;
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
514
3e8a4d057b77 expires daily time
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
515 } else if (value[n].data[0] == '+') {
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
516 value[n].data++;
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
517 value[n].len--;
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
518 minus = 0;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
519
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
520 } else if (value[n].data[0] == '-') {
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 = 1;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
524
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
525 } else {
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
526 minus = 0;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
527 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
528
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
529 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
530
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
531 if (hcf->expires_time == NGX_ERROR) {
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
532 return "invalid value";
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
533 }
577
4d9ea73a627a nginx-0.3.10-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 573
diff changeset
534
2164
b4ffe603fa86 check daily time range
Igor Sysoev <igor@sysoev.ru>
parents: 2163
diff changeset
535 if (hcf->expires == NGX_HTTP_EXPIRES_DAILY
b4ffe603fa86 check daily time range
Igor Sysoev <igor@sysoev.ru>
parents: 2163
diff changeset
536 && hcf->expires_time > 24 * 60 * 60)
b4ffe603fa86 check daily time range
Igor Sysoev <igor@sysoev.ru>
parents: 2163
diff changeset
537 {
b4ffe603fa86 check daily time range
Igor Sysoev <igor@sysoev.ru>
parents: 2163
diff changeset
538 return "daily time value must be less than 24 hours";
b4ffe603fa86 check daily time range
Igor Sysoev <igor@sysoev.ru>
parents: 2163
diff changeset
539 }
b4ffe603fa86 check daily time range
Igor Sysoev <igor@sysoev.ru>
parents: 2163
diff changeset
540
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
541 if (hcf->expires_time == NGX_PARSE_LARGE_TIME) {
326
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
542 return "value must be less than 68 years";
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
543 }
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
544
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
545 if (minus) {
2013
4c685f02a5a0 expires modified
Igor Sysoev <igor@sysoev.ru>
parents: 1655
diff changeset
546 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
547 }
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 return NGX_CONF_OK;
8733703a37f3 nginx-0.0.3-2004-04-26-00:13:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
550 }
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
551
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 static char *
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
554 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
555 {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
556 ngx_http_headers_conf_t *hcf = conf;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
557
2588
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
558 ngx_str_t *value;
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
559 ngx_uint_t i;
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
560 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
561 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
562 ngx_http_compile_complex_value_t ccv;
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
563
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
564 value = cf->args->elts;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
565
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
566 if (hcf->headers == NULL) {
625
fbed40ce7cb4 nginx-0.3.34-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 597
diff changeset
567 hcf->headers = ngx_array_create(cf->pool, 1,
fbed40ce7cb4 nginx-0.3.34-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 597
diff changeset
568 sizeof(ngx_http_header_val_t));
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
569 if (hcf->headers == NULL) {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
570 return NGX_CONF_ERROR;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
571 }
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
2588
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
574 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
575 if (hv == NULL) {
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
576 return NGX_CONF_ERROR;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
577 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
578
2588
a6954ce88b80 use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents: 2406
diff changeset
579 hv->hash = 1;
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 }