From: Jérôme Loyet <fat@php.net>
Date: Thu, 27 May 2010 22:31:28 +0000 (+0000)
Subject: bug: include paths were not evaluated to to full path
X-Git-Tag: php-5.4.0alpha1~191^2~1409
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cf687608e47624a3e1f43bbbae3bdc51c24757d;p=php

bug: include paths were not evaluated to to full path
---

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);