* PHP-5.4:
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Bug #62177 deactivate the linux test version on win
Fix bug #62177 Test Bug - finfo_file_regex.phpt
* PHP-5.3:
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Bug #62177 deactivate the linux test version on win
Fix bug #62177 Test Bug - finfo_file_regex.phpt
* PHP-5.4: (21 commits)
Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
fix unchecked emalloc
add CVE
add bug 62146
add bug #62082
sync with HEAD
sync with HEAD
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests)
Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
- Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
- add missing headers to avoid warnings
- add missing headers to avoid warnings
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
...
Conflicts:
NEWS
There's no change from the intended behavior. If INTL_G(default_locale)
is NULL, the default ICU locale, as given by locale_get_default() in
master, will still be used by ures_open().
null is now accepted for two first (mandatory arguments).
Passing null as the package name causes NULL to be passed to ICU and
the default ICU data to be loaded.
Passing null as the locale name causes the default locale to be used.
Memory leak in IntlDateFormatter constructor.
udat_setCalendar() clones the calendar before it adopts it,
so we were leaking the original calendar.
Also we now validate the calendar type.
