* 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
- (5.3) Fixed bug in the Windows implementation of
dns_get_record, where the two last parameters wouldn't be
filled unless the type were DNS_ANY (Gustavo).
- (5.3) Fixed bug in the Windows implementation of
dns_get_record, where the two last parameters wouldn't be
filled unless the type were DNS_ANY (Gustavo).
"raw mode". In this mide, $type (2nd parameter) is the numeric type of the record, and
the responses are not parsed -- the "type" element will be numeric and there will be
a "data" element with the raw data of the response buffer, which the programmer will
have to parse.
- Fixed bug in the Win32 implementation of dns_get_record, where the 3rd and 4th arguments
would only be filled if the 2nd ($type) was DNS_ANY.
- [DOC] The 3rd and 4th parameters can now be NULL (changed their arginfo).
