Mercurial > hg > nginx-ranges

comparison src/http/modules/ngx_http_addition_filter_module.c @ 578:f3a9e57d2e17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents 5c576ea5dbd9
children
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
43 ngx_conf_set_str_slot, 43 ngx_conf_set_str_slot,
44 NGX_HTTP_LOC_CONF_OFFSET, 44 NGX_HTTP_LOC_CONF_OFFSET,
45 offsetof(ngx_http_addition_conf_t, after_body), 45 offsetof(ngx_http_addition_conf_t, after_body),
46 NULL }, 46 NULL },
47 47
48 { ngx_string("addtion_types"), 48 { ngx_string("addition_types"),
49 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, 49 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
50 ngx_http_types_slot, 50 ngx_http_types_slot,
51 NGX_HTTP_LOC_CONF_OFFSET, 51 NGX_HTTP_LOC_CONF_OFFSET,
52 offsetof(ngx_http_addition_conf_t, types_keys), 52 offsetof(ngx_http_addition_conf_t, types_keys),
53 &ngx_http_html_default_types[0] }, 53 &ngx_http_html_default_types[0] },
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 }