diff --git a/NEWS b/NEWS index 63ee02113ee..67771d737f0 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ PHP NEWS As a side effect this allowed passign left hean list() "by reference", instead of compile-time error. (Dmitry) . Fixed bug #78531 (Crash when using undefined variable as object). (Dmitry) + . Fixed bug #78535 (auto_detect_line_endings value not parsed as bool). + (bugreportuser) - FFI: . Added missing FFI::isNull(). (Philip Hofstetter) diff --git a/ext/standard/file.c b/ext/standard/file.c index d0f574f2243..12effbdb290 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) diff --git a/ext/standard/file.h b/ext/standard/file.h index 6689dcd987e..a414f722fd9 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -117,7 +117,7 @@ php_meta_tags_token php_next_meta_token(php_meta_tags_data *); typedef struct { int pclose_ret; size_t def_chunk_size; - zend_long auto_detect_line_endings; + zend_bool auto_detect_line_endings; zend_long default_socket_timeout; char *user_agent; /* for the http wrapper */ char *from_address; /* for the ftp and http wrappers */ diff --git a/ext/standard/tests/file/auto_detect_line_endings_1.phpt b/ext/standard/tests/file/auto_detect_line_endings_1.phpt new file mode 100644 index 00000000000..c79082ecdb2 --- /dev/null +++ b/ext/standard/tests/file/auto_detect_line_endings_1.phpt @@ -0,0 +1,24 @@ +--TEST-- +auto_detect_line_endings --INI-- bool +--INI-- +auto_detect_line_endings=on +--STDIN-- +fooBar1 fooBar2 fooBar3 +--FILE-- + +--EXPECTF-- +string(1) "1" +string(8) "fooBar1 " +string(8) "fooBar2 " +string(8) "fooBar3 +" +Done diff --git a/ext/standard/tests/file/auto_detect_line_endings_2.phpt b/ext/standard/tests/file/auto_detect_line_endings_2.phpt new file mode 100644 index 00000000000..f33a055e083 --- /dev/null +++ b/ext/standard/tests/file/auto_detect_line_endings_2.phpt @@ -0,0 +1,28 @@ +--TEST-- +ini_set auto_detect_line_endings bool +--FILE-- + +--EXPECTF-- +string(2) "on" +string(8) "fooBar1 " +string(8) "fooBar2 " +string(7) "fooBar3" +Done +--CLEAN-- +