clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug: include paths were not evaluated to to full path

Browse Source
This commit is contained in:
Jérôme Loyet 2010-05-27 22:31:28 +00:00
parent ce03ced4d7
commit 66ef4d185c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sapi/fpm/fpm/fpm_conf.c
View File

@ -742,7 +742,6 @@ static void fpm_conf_ini_parser_entry(zval *name, zval *value, void *arg TSRMLS_
}
if (!strcmp(Z_STRVAL_P(name), "include")) {
// fpm_conf_ini_parser_include(value, error);
if (ini_include) {
zlog(ZLOG_STUFF, ZLOG_ERROR, "[%s:%d] two includes at the same time !", ini_filename, ini_lineno);
*error = 1;
@ -913,6 +912,7 @@ int fpm_conf_load_ini_file(char *filename TSRMLS_DC) /* {{{ */
if (ini_include) {
char *tmp = ini_include;
ini_include = NULL;
fpm_evaluate_full_path(&tmp);
fpm_conf_ini_parser_include(tmp, &error TSRMLS_CC);
if (error) {
free(tmp);