diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-20 10:58:03 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-20 10:58:33 +0200 |
| commit | 18ad38a7b21babeef16e25981c549e51da5388f1 (patch) | |
| tree | 94c8b396293bfd8e313b2993acf193676b8181fb | |
| parent | 721ca87e56057b531ac3e431df52532a1e5d4ae6 (diff) | |
| parent | fa10abd6d75aeb9fde1f53cf80116e39577a4555 (diff) | |
| download | php-git-18ad38a7b21babeef16e25981c549e51da5388f1.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79491: Search for .user.ini extends up to root dir
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -15,6 +15,9 @@ PHP NEWS . Fixed bug #79336 (ext/exif/tests/bug79046.phpt fails on Big endian arch). (Nikita) +- FCGI: + . Fixed bug #79491 (Search for .user.ini extends up to root dir). (cmb) + - MBString: . Fixed bug #79441 (Segfault in mb_chr() if internal encoding is unsupported). (Girgias) diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 29c61e9a18..bf3029f150 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -781,7 +781,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(); @@ -834,7 +834,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); @@ -930,7 +930,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); |