comparison src/http/modules/ngx_http_xslt_filter_module.c @ 5330:314c3d7cc3a5

Backed out f1a91825730a and 7094bd12c1ff. While ngx_get_full_name() might have a bit more descriptive arguments, the ngx_conf_full_name() is generally easier to use when parsing configuration and limits exposure of cycle->prefix / cycle->conf_prefix details.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 20 Aug 2013 21:11:19 +0400
parents f1a91825730a
children e491b26fa5a1
comparison
equal deleted inserted replaced
5329:00bdc9f08a16 5330:314c3d7cc3a5
890 return NGX_CONF_ERROR; 890 return NGX_CONF_ERROR;
891 } 891 }
892 892
893 ngx_memzero(sheet, sizeof(ngx_http_xslt_sheet_t)); 893 ngx_memzero(sheet, sizeof(ngx_http_xslt_sheet_t));
894 894
895 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &value[1]) != NGX_OK) { 895 if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
896 return NGX_CONF_ERROR; 896 return NGX_CONF_ERROR;
897 } 897 }
898 898
899 xmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_xslt_filter_module); 899 xmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_xslt_filter_module);
900 900