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 6c212a22450a266f2b2b94eb1ed2a24af51d725f..898830e3d6ba35b58e1912019ef4a1f4b0236da1 100644 (file)
--- 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);