comparison src/http/modules/ngx_http_charset_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 b31656313b59
comparison
equal deleted inserted replaced
57:5df375c55338 58:b55cbf18157e
104 ngx_null_command 104 ngx_null_command
105 }; 105 };
106 106
107 107
108 static ngx_http_module_t ngx_http_charset_filter_module_ctx = { 108 static ngx_http_module_t ngx_http_charset_filter_module_ctx = {
109 NULL, /* pre conf */ 109 NULL, /* preconfiguration */
110 NULL, /* postconfiguration */
110 111
111 ngx_http_charset_create_main_conf, /* create main configuration */ 112 ngx_http_charset_create_main_conf, /* create main configuration */
112 ngx_http_charset_init_main_conf, /* init main configuration */ 113 ngx_http_charset_init_main_conf, /* init main configuration */
113 114
114 NULL, /* create server configuration */ 115 NULL, /* create server configuration */
118 ngx_http_charset_merge_loc_conf /* merge location configuration */ 119 ngx_http_charset_merge_loc_conf /* merge location configuration */
119 }; 120 };
120 121
121 122
122 ngx_module_t ngx_http_charset_filter_module = { 123 ngx_module_t ngx_http_charset_filter_module = {
123 NGX_MODULE, 124 NGX_MODULE_V1,
124 &ngx_http_charset_filter_module_ctx, /* module context */ 125 &ngx_http_charset_filter_module_ctx, /* module context */
125 ngx_http_charset_filter_commands, /* module directives */ 126 ngx_http_charset_filter_commands, /* module directives */
126 NGX_HTTP_MODULE, /* module type */ 127 NGX_HTTP_MODULE, /* module type */
127 ngx_http_charset_filter_init, /* init module */ 128 ngx_http_charset_filter_init, /* init module */
128 NULL /* init process */ 129 NULL /* init process */
146 147
147 if (lcf->enable == 0) { 148 if (lcf->enable == 0) {
148 return ngx_http_next_header_filter(r); 149 return ngx_http_next_header_filter(r);
149 } 150 }
150 151
151 if (r->headers_out.content_type == NULL) { 152 if (r->headers_out.content_type.len == 0) {
152 return ngx_http_next_header_filter(r); 153 return ngx_http_next_header_filter(r);
153 } 154 }
154 155
155 if (ngx_strncasecmp(r->headers_out.content_type->value.data, 156 if (ngx_strncasecmp(r->headers_out.content_type.data, "text/", 5) != 0
156 "text/", 5) != 0 157 && ngx_strncasecmp(r->headers_out.content_type.data,
157 && ngx_strncasecmp(r->headers_out.content_type->value.data, 158 "application/x-javascript", 24) != 0)
158 "application/x-javascript", 24) != 0)
159 { 159 {
160 return ngx_http_next_header_filter(r); 160 return ngx_http_next_header_filter(r);
161 } 161 }
162 162
163 if (ngx_strstr(r->headers_out.content_type->value.data, "charset") != NULL) 163 if (ngx_strstr(r->headers_out.content_type.data, "charset") != NULL)
164 { 164 {
165 return ngx_http_next_header_filter(r); 165 return ngx_http_next_header_filter(r);
166 } 166 }
167 167
168 if (r->headers_out.status == NGX_HTTP_MOVED_PERMANENTLY 168 if (r->headers_out.status == NGX_HTTP_MOVED_PERMANENTLY