diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-14 18:47:53 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-14 18:48:28 +0200 |
| commit | d0247a63b66bfca355cad6005ae7fc3fe9c9e5dc (patch) | |
| tree | 6945e83b69a30ff630a7a445a9330bbf5f75556c /ext/standard/file.c | |
| parent | 3f76f9416ff82c10174dc382285b4b91789e278b (diff) | |
| parent | 00ad365125df54d1776882e350c8d2b134511abd (diff) | |
| download | php-git-d0247a63b66bfca355cad6005ae7fc3fe9c9e5dc.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78535: auto_detect_line_endings value not parsed as bool
Diffstat (limited to 'ext/standard/file.c')
| -rw-r--r-- | ext/standard/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index d0f574f224..12effbdb29 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) |