Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_addition_filter_module.c @ 554:5c576ea5dbd9 NGINX_0_8_29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.29 *) Change: now the "009" status code is written to an access log for proxied HTTP/0.9 responses. *) Feature: the "addition_types", "charset_types", "gzip_types", "ssi_types", "sub_filter_types", and "xslt_types" directives support an "*" parameter. *) Feature: GCC 4.1+ built-in atomic operations usage. Thanks to W-Mark Kubacki. *) Feature: the --with-libatomic[=DIR] option in the configure. Thanks to W-Mark Kubacki. *) Bugfix: listen unix domain socket had limited access rights. *) Bugfix: cached HTTP/0.9 responses were handled incorrectly. *) Bugfix: regular expression named captures given by "?P<...>" did not work in a "server_name" directive. Thanks to Maxim Dounin.
author Igor Sysoev <http://sysoev.ru>
date Mon, 30 Nov 2009 00:00:00 +0300
parents 005a70f9573b
children d0f7a625f27c
comparison
equal deleted inserted replaced
553:63dde5a94756 554:5c576ea5dbd9
235 ngx_http_addition_conf_t *conf = child; 235 ngx_http_addition_conf_t *conf = child;
236 236
237 ngx_conf_merge_str_value(conf->before_body, prev->before_body, ""); 237 ngx_conf_merge_str_value(conf->before_body, prev->before_body, "");
238 ngx_conf_merge_str_value(conf->after_body, prev->after_body, ""); 238 ngx_conf_merge_str_value(conf->after_body, prev->after_body, "");
239 239
240 if (ngx_http_merge_types(cf, conf->types_keys, &conf->types, 240 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
241 prev->types_keys, &prev->types, 241 &prev->types_keys, &prev->types,
242 ngx_http_html_default_types) 242 ngx_http_html_default_types)
243 != NGX_OK) 243 != NGX_OK)
244 { 244 {
245 return NGX_CONF_ERROR; 245 return NGX_CONF_ERROR;
246 } 246 }