diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-05 10:36:16 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-12 11:47:47 +0200 |
| commit | bdba0cd3d270d5c0511709e3b8e2e0cd6186a410 (patch) | |
| tree | a7d4b6639846d37f2641595bdff5ed012cbe8a42 | |
| parent | 85e241c35c3d4cb1cc027ecca2572e1ff04e3d06 (diff) | |
| download | php-git-bdba0cd3d270d5c0511709e3b8e2e0cd6186a410.tar.gz | |
Fix #79489: .user.ini does not inherit
On Windows, PATH_TRANSLATED may contain backslashes as well as slashes,
so we must not only check for `DEFAULT_SLASH`.
| -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) - Opcache: . Fixed bug #79535 (PHP crashes with specific opcache.optimization_level). diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 8c8e1463d5..37f8eac6e0 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -843,7 +843,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 = '/'; |