From 66ef4d185c1a27b0eff46dd8ef9b72bc033e26d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Loyet?= Date: Thu, 27 May 2010 22:31:28 +0000 Subject: [PATCH] bug: include paths were not evaluated to to full path --- sapi/fpm/fpm/fpm_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 6c212a2245..898830e3d6 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -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); -- 2.40.0