summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-05-19 16:00:19 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-05-19 16:00:19 +0200
commit6a9db9573e58675f0c38f5da18fbc1b1a1f678d4 (patch)
treeb99062aa169f7f8ef4b30f6aac4e2591a3493dd8
parentd2797505cd907ab6cef4b66f4042a256a439d7ca (diff)
parent85ac5643ff07e07e40df89510726e1bc66e6a50b (diff)
downloadphp-git-6a9db9573e58675f0c38f5da18fbc1b1a1f678d4.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix INI setting member name
-rw-r--r--sapi/phpdbg/phpdbg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 8b01acdfe2..8207e36540 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -71,7 +71,7 @@ static PHP_INI_MH(OnUpdateEol)
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("phpdbg.path", "", PHP_INI_SYSTEM | PHP_INI_PERDIR, OnUpdateString, socket_path, zend_phpdbg_globals, phpdbg_globals)
- STD_PHP_INI_ENTRY("phpdbg.eol", "2", PHP_INI_ALL, OnUpdateEol, socket_path, zend_phpdbg_globals, phpdbg_globals)
+ STD_PHP_INI_ENTRY("phpdbg.eol", "2", PHP_INI_ALL, OnUpdateEol, eol, zend_phpdbg_globals, phpdbg_globals)
PHP_INI_END()
static zend_bool phpdbg_booted = 0;