summaryrefslogtreecommitdiff
path: root/ext/standard/file.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-09-14 18:49:00 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-09-14 18:49:00 +0200
commita858a53c079bdabbeddc36223ce0c6ae376ee9a8 (patch)
treeea7cd43ef2a0e4e62f6b07ebd9aed628ec64182a /ext/standard/file.c
parent3372a24b99401b63bfe3e9fe6f356989bb02aa3e (diff)
parentd0247a63b66bfca355cad6005ae7fc3fe9c9e5dc (diff)
downloadphp-git-a858a53c079bdabbeddc36223ce0c6ae376ee9a8.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix #78535: auto_detect_line_endings value not parsed as bool
Diffstat (limited to 'ext/standard/file.c')
-rw-r--r--ext/standard/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 3cd9b62ac0..9958c0d354 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -163,7 +163,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("user_agent", NULL, PHP_INI_ALL, OnUpdateString, user_agent, php_file_globals, file_globals)
STD_PHP_INI_ENTRY("from", NULL, PHP_INI_ALL, OnUpdateString, from_address, php_file_globals, file_globals)
STD_PHP_INI_ENTRY("default_socket_timeout", "60", PHP_INI_ALL, OnUpdateLong, default_socket_timeout, php_file_globals, file_globals)
- STD_PHP_INI_ENTRY("auto_detect_line_endings", "0", PHP_INI_ALL, OnUpdateLong, auto_detect_line_endings, php_file_globals, file_globals)
+ STD_PHP_INI_ENTRY("auto_detect_line_endings", "0", PHP_INI_ALL, OnUpdateBool, auto_detect_line_endings, php_file_globals, file_globals)
PHP_INI_END()
PHP_MINIT_FUNCTION(file)