cvs: php-src(PHP_5_3) /sapi/cgi cgi_main.c

pajoye Mon Jun 22 14:10:40 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/cgi cgi_main.c Log: - #48624 .user.ini never gets parsed http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.43&r2=1.267.2.15.2.50.2.44&diff_format=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.43 php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.44 --- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.43 Wed Jun 17 19:28:52 2009 +++ php-src/sapi/cgi/cgi_main.c Mon Jun 22 14:10:40 2009 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.43 2009/06/17 19:28:52 pajoye Exp $ */ +/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.44 2009/06/22 14:10:40 pajoye Exp $ */ #include "php.h" #include "php_globals.h" @@ -754,7 +754,7 @@ to find more user.ini, if not we only scan the current path. */ if (strncmp(s1, s2, s_len) == 0) { - ptr = s1 + start; /* start is the point where doc_root ends! */ + ptr = s2 + start; /* start is the point where doc_root ends! */ while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) { *ptr = 0; php_parse_user_ini_file(path, PG(user_ini_filename), entry->user_config TSRMLS_CC);