Mercurial > hg > nginx-vendor-current
diff src/http/modules/ngx_http_charset_filter_module.c @ 74:77969b24f355 NGINX_0_1_37
nginx 0.1.37
*) Change: now the "\n" is added to the end of the "nginx.pid" file.
*) Bugfix: the responses may be transferred not completely, if many
parts or the big parts were included by SSI.
*) Bugfix: if all backends had returned the 404 reponse and the
"http_404" parameter of the "proxy_next_upstream" or
"fastcgi_next_upstream" directives was used, then nginx started to
request all backends again.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 23 Jun 2005 00:00:00 +0400 |
parents | b31656313b59 |
children | 9db7e0b5b27f |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_charset_filter_module.c +++ b/src/http/modules/ngx_http_charset_filter_module.c @@ -34,7 +34,6 @@ typedef struct { typedef struct { ngx_flag_t enable; - ngx_flag_t autodetect; ngx_int_t default_charset; ngx_int_t source_charset; @@ -96,13 +95,6 @@ static ngx_command_t ngx_http_charset_f offsetof(ngx_http_charset_loc_conf_t, enable), NULL }, - { ngx_string("autodetect_charset"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, - ngx_conf_set_flag_slot, - NGX_HTTP_LOC_CONF_OFFSET, - offsetof(ngx_http_charset_loc_conf_t, autodetect), - NULL }, - ngx_null_command }; @@ -570,7 +562,6 @@ ngx_http_charset_create_loc_conf(ngx_con } lcf->enable = NGX_CONF_UNSET; - lcf->autodetect = NGX_CONF_UNSET; lcf->default_charset = NGX_CONF_UNSET; lcf->source_charset = NGX_CONF_UNSET; @@ -585,8 +576,6 @@ ngx_http_charset_merge_loc_conf(ngx_conf ngx_http_charset_loc_conf_t *conf = child; ngx_conf_merge_value(conf->enable, prev->enable, 0); - ngx_conf_merge_value(conf->autodetect, prev->autodetect, 0); - if (conf->default_charset == NGX_CONF_UNSET) { conf->default_charset = prev->default_charset;