Mercurial > hg > nginx
comparison src/http/modules/perl/ngx_http_perl_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 | 79b9101cecf4 |
comparison
equal
deleted
inserted
replaced
| 5329:00bdc9f08a16 | 5330:314c3d7cc3a5 |
|---|---|
| 483 #endif | 483 #endif |
| 484 | 484 |
| 485 if (pmcf->modules != NGX_CONF_UNSET_PTR) { | 485 if (pmcf->modules != NGX_CONF_UNSET_PTR) { |
| 486 m = pmcf->modules->elts; | 486 m = pmcf->modules->elts; |
| 487 for (i = 0; i < pmcf->modules->nelts; i++) { | 487 for (i = 0; i < pmcf->modules->nelts; i++) { |
| 488 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &m[i]) | 488 if (ngx_conf_full_name(cf->cycle, &m[i], 0) != NGX_OK) { |
| 489 != NGX_OK) | |
| 490 { | |
| 491 return NGX_CONF_ERROR; | 489 return NGX_CONF_ERROR; |
| 492 } | 490 } |
| 493 } | 491 } |
| 494 } | 492 } |
| 495 | 493 |