* master:
add NEWS for 5.6 too
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
fix test
split the glob() test to test different basedir
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()
Add NEWS entry for log() improvements
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and raise visibility of GitHub PR process
Bug #41631: Observe socket read timeouts in SSL streams
wrap int8_t and int16_t with #ifdef to avoid possible clashes
- Updated to version 2014.6 (2014f)
Removed Countable::count() change info from UPGRADE.INTERNALS too
NEWS and UPGRADING for intdiv()
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Fixed skip case for intdiv 64-bit test
Use callback structure
Add EXPECTF
Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
5.5.17 now
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
...
Conflicts:
ext/fileinfo/libmagic/softmagic.c
main/streams/xp_socket.c
* master: (77 commits)
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
Fix potential segfault in dns_get_record()
Revert "Add optional second arg to unserialize()"
5.5.15 now
update NEWS
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Fix broken test.
Add a mime type map generation script and update the header.
Move the mime type map out of php_cli_server.c for easier generation.
Replace the CLI server's linear search for extensions with a hash table.
fix test
Remove unused included file
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Conflicts:
Zend/zend_closures.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/spl/spl_array.c
ext/standard/basic_functions.c
ext/standard/dns.c
ext/standard/var.c
* master: (29 commits)
drop exec perm on doc files
fix test for 5.4/5.5
restore correct behavior of DateTime
fix test use invalid code
add test for previous fix
NEWS
NEWS
NEWS
Fix regression introduce in fix for bug #67118
update news
update NEWS
Fix tests
Fix possible segfault depending on memory location...
Fixed startup segfault in non-debug builds Fixes issue #87
PHP 5.4/5.5 compability in phpdbg_watch.c
fix gcov data with some locales (again)
fix gcov data with some locales (again)
fix gcov data with some locales (again)
Update NEWS
Fixed startup segfault in non-debug builds Fixes issue #87
...
* PHP-5.5:
backport this piece from 5.6, related to the #66307 fix
Fixed bug #66307 Fileinfo crashes with powerpoint files
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
fix my last commit with some locales
Anatol Belski