comparison src/http/modules/ngx_http_headers_filter_module.c @ 58:b55cbf18157e NGINX_0_1_29

nginx 0.1.29 *) Feature: the ngx_http_ssi_module supports "include virtual" command. *) Feature: the ngx_http_ssi_module supports the condition command like 'if expr="$NAME"' and "else" and "endif" commands. Only one nested level is supported. *) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and DATE_GMT variables and "config timefmt" command. *) Feature: the "ssi_ignore_recycled_buffers" directive. *) Bugfix: the "echo" command did not show the default value for the empty QUERY_STRING variable. *) Change: the ngx_http_proxy_module was rewritten. *) Feature: the "proxy_redirect", "proxy_pass_request_headers", "proxy_pass_request_body", and "proxy_method" directives. *) Feature: the "proxy_set_header" directive. The "proxy_x_var" was canceled and must be replaced with the proxy_set_header directive. *) Change: the "proxy_preserve_host" is canceled and must be replaced with the "proxy_set_header Host $host" and the "proxy_redirect off" directives, the "proxy_set_header Host $host:$proxy_port" directive and the appropriate proxy_redirect directives. *) Change: the "proxy_set_x_real_ip" is canceled and must be replaced with the "proxy_set_header X-Real-IP $remote_addr" directive. *) Change: the "proxy_add_x_forwarded_for" is canceled and must be replaced with the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for" directive. *) Change: the "proxy_set_x_url" is canceled and must be replaced with the "proxy_set_header X-URL http://$host:$server_port$request_uri" directive. *) Feature: the "fastcgi_param" directive. *) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params" directive are canceled and must be replaced with the fastcgi_param directives. *) Feature: the "index" directive can use the variables. *) Feature: the "index" directive can be used at http and server levels. *) Change: the last index only in the "index" directive can be absolute. *) Feature: the "rewrite" directive can use the variables. *) Feature: the "internal" directive. *) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR, SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME, REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables. *) Change: nginx now passes the invalid lines in a client request headers or a backend response header. *) Bugfix: if the backend did not transfer response for a long time and the "send_timeout" was less than "proxy_read_timeout", then nginx returned the 408 response. *) Bugfix: the segmentation fault was occurred if the backend sent an invalid line in response header; bug appeared in 0.1.26. *) Bugfix: the segmentation fault may occurred in FastCGI fault tolerance configuration. *) Bugfix: the "expires" directive did not remove the previous "Expires" and "Cache-Control" headers. *) Bugfix: nginx did not take into account trailing dot in "Host" header line. *) Bugfix: the ngx_http_auth_module did not work under Linux. *) Bugfix: the rewrite directive worked incorrectly, if the arguments were in a request. *) Bugfix: nginx could not be built on MacOS X.
author Igor Sysoev <http://sysoev.ru>
date Thu, 12 May 2005 00:00:00 +0400
parents 72eb30262aac
children 962c43960644
comparison
equal deleted inserted replaced
57:5df375c55338 58:b55cbf18157e
39 ngx_null_command 39 ngx_null_command
40 }; 40 };
41 41
42 42
43 static ngx_http_module_t ngx_http_headers_filter_module_ctx = { 43 static ngx_http_module_t ngx_http_headers_filter_module_ctx = {
44 NULL, /* pre conf */ 44 NULL, /* preconfiguration */
45 NULL, /* postconfiguration */
45 46
46 NULL, /* create main configuration */ 47 NULL, /* create main configuration */
47 NULL, /* init main configuration */ 48 NULL, /* init main configuration */
48 49
49 NULL, /* create server configuration */ 50 NULL, /* create server configuration */
53 ngx_http_headers_merge_conf /* merge location configuration */ 54 ngx_http_headers_merge_conf /* merge location configuration */
54 }; 55 };
55 56
56 57
57 ngx_module_t ngx_http_headers_filter_module = { 58 ngx_module_t ngx_http_headers_filter_module = {
58 NGX_MODULE, 59 NGX_MODULE_V1,
59 &ngx_http_headers_filter_module_ctx, /* module context */ 60 &ngx_http_headers_filter_module_ctx, /* module context */
60 ngx_http_headers_filter_commands, /* module directives */ 61 ngx_http_headers_filter_commands, /* module directives */
61 NGX_HTTP_MODULE, /* module type */ 62 NGX_HTTP_MODULE, /* module type */
62 ngx_http_headers_filter_init, /* init module */ 63 ngx_http_headers_filter_init, /* init module */
63 NULL /* init process */ 64 NULL /* init process */
69 70
70 static ngx_int_t 71 static ngx_int_t
71 ngx_http_headers_filter(ngx_http_request_t *r) 72 ngx_http_headers_filter(ngx_http_request_t *r)
72 { 73 {
73 size_t len; 74 size_t len;
75 ngx_uint_t i;
74 ngx_table_elt_t *expires, *cc; 76 ngx_table_elt_t *expires, *cc;
75 ngx_http_headers_conf_t *conf; 77 ngx_http_headers_conf_t *conf;
76 78
77 if (r->headers_out.status != NGX_HTTP_OK) { 79 if (r->headers_out.status != NGX_HTTP_OK || r->main) {
78 return ngx_http_next_header_filter(r); 80 return ngx_http_next_header_filter(r);
79 } 81 }
80 82
81 conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_filter_module); 83 conf = ngx_http_get_module_loc_conf(r, ngx_http_headers_filter_module);
82 84
83 if (conf->expires != NGX_HTTP_EXPIRES_OFF) { 85 if (conf->expires != NGX_HTTP_EXPIRES_OFF) {
84 86
85 expires = ngx_list_push(&r->headers_out.headers); 87 expires = r->headers_out.expires;
88
86 if (expires == NULL) { 89 if (expires == NULL) {
87 return NGX_ERROR; 90
91 expires = ngx_list_push(&r->headers_out.headers);
92 if (expires == NULL) {
93 return NGX_ERROR;
94 }
95
96 r->headers_out.expires = expires;
97
98 expires->hash = 1;
99 expires->key.len = sizeof("Expires") - 1;
100 expires->key.data = (u_char *) "Expires";
88 } 101 }
89 102
90 r->headers_out.expires = expires; 103 len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
91 104 expires->value.len = len - 1;
92 cc = ngx_list_push(&r->headers_out.headers); 105
106 cc = r->headers_out.cache_control.elts;
107
93 if (cc == NULL) { 108 if (cc == NULL) {
94 return NGX_ERROR; 109
110 cc = ngx_list_push(&r->headers_out.headers);
111 if (cc == NULL) {
112 return NGX_ERROR;
113 }
114
115 cc->hash = 1;
116 cc->key.len = sizeof("Cache-Control") - 1;
117 cc->key.data = (u_char *) "Cache-Control";
118
119 } else {
120 for (i = 1; i < r->headers_out.cache_control.nelts; i++) {
121 cc[i].hash = 0;
122 }
95 } 123 }
96
97 r->headers_out.cache_control = cc;
98
99 len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
100
101 expires->key.len = sizeof("Expires") - 1;
102 expires->key.data = (u_char *) "Expires";
103 expires->value.len = len - 1;
104
105 cc->key.len = sizeof("Cache-Control") - 1;
106 cc->key.data = (u_char *) "Cache-Control";
107 124
108 if (conf->expires == NGX_HTTP_EXPIRES_EPOCH) { 125 if (conf->expires == NGX_HTTP_EXPIRES_EPOCH) {
109 expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT"; 126 expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT";
110 127
111 cc->value.len = sizeof("no-cache") - 1; 128 cc->value.len = sizeof("no-cache") - 1;