Mercurial > hg > nginx-mail

comparison src/http/modules/ngx_http_addition_filter_module.c @ 665:0b460e61bdcd default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents 5c576ea5dbd9
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
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 }