diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-12 11:48:11 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-12 11:48:36 +0200 |
| commit | 4b0d5e0faf38f936625ac127a954c1a16dd1cb07 (patch) | |
| tree | 2a1d0ec32300740a3c6448373b468f41ef98efba | |
| parent | 6cb3d5e2c256422bbdaa749d254469a3c3a23239 (diff) | |
| parent | bdba0cd3d270d5c0511709e3b8e2e0cd6186a410 (diff) | |
| download | php-git-4b0d5e0faf38f936625ac127a954c1a16dd1cb07.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79489: .user.ini does not inherit
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -4,6 +4,7 @@ PHP NEWS - Core: . Fixed bug #79566 (Private SHM is not private on Windows). (cmb) + . Fixed bug #79489 (.user.ini does not inherit). (cmb) - FFI: . Fixed bug #79571 (FFI: var_dumping unions may segfault). (cmb) diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index bf3029f150..cd79475fde 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -835,7 +835,11 @@ static void php_cgi_ini_activate_user_config(char *path, size_t path_len, const if (strncmp(s1, s2, s_len) == 0) { #endif char *ptr = s2 + doc_root_len; +#ifdef PHP_WIN32 + while ((ptr = strpbrk(ptr, "\\/")) != NULL) { +#else while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) { +#endif *ptr = 0; php_parse_user_ini_file(path, PG(user_ini_filename), entry->user_config); *ptr = '/'; |