Klaus Demo nginx / 92f0126
Style improved after 12dd27b74117. Maxim Dounin 8 years ago
2 changed file(s) with 10 addition(s) and 12 deletion(s). Raw diff Collapse all Expand all
799799 ngx_int_t
800800 ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, ngx_uint_t conf_prefix)
801801 {
802 return ngx_get_full_name(cycle->pool,
803 conf_prefix ? &cycle->conf_prefix:
804 &cycle->prefix,
805 name);
802 ngx_str_t *prefix;
803
804 prefix = conf_prefix ? &cycle->conf_prefix : &cycle->prefix;
805
806 return ngx_get_full_name(cycle->pool, prefix, name);
806807 }
807808
808809
13261326 {
13271327 ngx_http_script_full_name_code_t *code;
13281328
1329 ngx_str_t value;
1329 ngx_str_t value, *prefix;
13301330
13311331 code = (ngx_http_script_full_name_code_t *) e->ip;
13321332
13331333 value.data = e->buf.data;
13341334 value.len = e->pos - e->buf.data;
13351335
1336 if (ngx_get_full_name(e->request->pool,
1337 code->conf_prefix
1338 ? (ngx_str_t *) &ngx_cycle->conf_prefix:
1339 (ngx_str_t *) &ngx_cycle->prefix,
1340 &value)
1341 != NGX_OK)
1342 {
1336 prefix = code->conf_prefix ? (ngx_str_t *) &ngx_cycle->conf_prefix:
1337 (ngx_str_t *) &ngx_cycle->prefix;
1338
1339 if (ngx_get_full_name(e->request->pool, prefix, &value) != NGX_OK) {
13431340 e->ip = ngx_http_script_exit;
13441341 e->status = NGX_HTTP_INTERNAL_SERVER_ERROR;
13451342 return;