php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1'

Browse Source 
* PHP-8.1:
  Fix GH-8310: Registry settings are no longer recognized
This commit is contained in:
Christoph M. Becker
2022-04-06 17:34:43 +02:00
parent d03a94a0a6 1bd9890b20
commit 4117063824
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/main.c
View File

@@ -2489,7 +2489,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file)
#ifdef PHP_WIN32
if(primary_file->filename) {
UpdateIniFromRegistry((char*)primary_file->filename);
UpdateIniFromRegistry(ZSTR_VAL(primary_file->filename));
}
#endif
@@ -2581,7 +2581,7 @@ PHPAPI int php_execute_simple_script(zend_file_handle *primary_file, zval *ret)
zend_try {
#ifdef PHP_WIN32
if(primary_file->filename) {
UpdateIniFromRegistry((char*)primary_file->filename);
UpdateIniFromRegistry(ZSTR_VAL(primary_file->filename));
}
#endif