summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2009-06-22 14:10:40 +0000
committerPierre Joye <pajoye@php.net>2009-06-22 14:10:40 +0000
commita7db554314e6652807d195fd483e9fe3a9359569 (patch)
tree8bbc0b63141bda925f2aeb5baea8269ff1198c58
parentd1fb4d2da40eab39e72e616aeb6b6678f4cdc0a6 (diff)
downloadphp-git-a7db554314e6652807d195fd483e9fe3a9359569.tar.gz
- #48624 .user.ini never gets parsed
-rw-r--r--sapi/cgi/cgi_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index fe88d67c09..46e6a8330a 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -754,7 +754,7 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha
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);