fat Thu, 27 May 2010 22:31:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299881
Log:
bug: include paths were not evaluated to to full path
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2010-05-27
22:18:58 UTC (rev 299880)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2010-05-27
22:31:28 UTC (rev 299881)
@@ -742,7 +742,6 @@
}
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 @@
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);
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2010-05-27 22:18:58 UTC (rev
299880)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2010-05-27 22:31:28 UTC (rev
299881)
@@ -742,7 +742,6 @@
}
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 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
