clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3' into PHP-7.4

Browse Source 
* PHP-7.3:
  Fix #79489: .user.ini does not inherit
This commit is contained in:
Christoph M. Becker 2020-05-12 11:48:11 +02:00
commit 4b0d5e0faf
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -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)

4
sapi/cgi/cgi_main.c
View File

@ -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 = '/';