diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-20 11:00:01 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-20 11:00:01 +0200 |
| commit | 193cb97a0e8a85263430e2850a5c86af11802951 (patch) | |
| tree | 7cffef4b17c8c485af30a83b5fb2ee78775f7de5 /sapi/cgi | |
| parent | ae5d7e4e96aa0ebc289f32090272ff0da0f21ed6 (diff) | |
| parent | 18ad38a7b21babeef16e25981c549e51da5388f1 (diff) | |
| download | php-git-193cb97a0e8a85263430e2850a5c86af11802951.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79491: Search for .user.ini extends up to root dir
Diffstat (limited to 'sapi/cgi')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index dfe595a97a..3198319b1a 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -775,7 +775,7 @@ static void sapi_cgi_log_message(char *message, int syslog_type_int) /* {{{ php_cgi_ini_activate_user_config */ -static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const char *doc_root, size_t doc_root_len, int start) +static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const char *doc_root, size_t doc_root_len) { user_config_cache_entry *new_entry, *entry; time_t request_time = (time_t)sapi_get_request_time(); @@ -828,7 +828,7 @@ static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const #else if (strncmp(s1, s2, s_len) == 0) { #endif - char *ptr = s2 + start; /* start is the point where doc_root ends! */ + char *ptr = s2 + doc_root_len; while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) { *ptr = 0; php_parse_user_ini_file(path, PG(user_ini_filename), entry->user_config); @@ -927,7 +927,7 @@ static int sapi_cgi_activate(void) doc_root = estrndup(doc_root, doc_root_len); zend_str_tolower(doc_root, doc_root_len); #endif - php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, (doc_root_len > 0 && (doc_root_len - 1))); + php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len); #ifdef PHP_WIN32 efree(doc_root); |