Merge branch 'PHP-7.0'

Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)

Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)

Add void return type

Revert "Fixed bug Bug #70895 null ptr deref and segfault"

This reverts commit 8eef11d3179fe7c6fed8393c1bbae96fcab05c49.

Revert "refix bug #70895"

This reverts commit 93240102e0830802ca1b27ccabd9a899a1de7570.

Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))"

This reverts commit e4e54f33ceb4ecce33397c867b45862af85c1fda.

Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))

Include tail \0

refix bug #70895

move this code to where it belongs, no behavior change to actual
throwing function, thus retaining compat with old ZPP

Fixed bug Bug #70895 null ptr deref and segfault

Added zend_internal_function.reserved[] fields, to allow extensions keep additional associated information.
We didn't have zend_internal_function.reserved[] in PHP5, but we always allocated space

Added zend_internal_function.reserved[] fields, to allow extensions keep additional associated information.
We didn't have zend_internal_function.reserved[] in PHP5, but we always allocated space for zend_function union, and extensions were able to reuse zend_function.op_array.reserved[] even for internal function. Now this is not possible. And extensions have to use zend_function.op_array.reserved[] for user functions and zend_function.internal_function.reserved[] for internal.

show more ...

Removed or simplified incorrect SEPARATE_*() macros usage.

Short-circuit zend_parse_parameters_none() so that expensive zpp() call never happens in non-exceptional case

Merge branch 'PHP-5.6'

* PHP-5.6: (21 commits)
fix unit tests
update NEWS
add NEWS for fixes
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in

Merge branch 'PHP-5.6'

* PHP-5.6: (21 commits)
fix unit tests
update NEWS
add NEWS for fixes
Improve fix for #70172
Fix bug #70312 - HAVAL gives wrong hashes in specific cases
fix test
add test
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Fix bug #70172 - Use After Free Vulnerability in unserialize()
Fix bug #70388 - SOAP serialize_function_call() type confusion
Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
Improve fix for #70385
Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
Fix for bug #69782
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
...

Conflicts:
ext/exif/exif.c
ext/gmp/gmp.c
ext/pcre/php_pcre.c
ext/session/session.c
ext/session/tests/session_decode_variation3.phpt
ext/soap/soap.c
ext/spl/spl_observer.c
ext/standard/var.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/xsl/xsltprocessor.c

show more ...

Added missing set of fcc->initialized flag.

Add myself into list of authors of the most refactored files.

Mark error and exception functions as "cold" (Matt's idea)

Removed unused code

Fixed bug #70156 (Segfault in zend_find_alias_name)

Updated zend_update_static_property

Use NULL where possible for exception class

Matches usage of zend_throw_exception()/zend_throw_exception_ex().

Throw TypeError for invalid callback

Matches behavior of zend_internal_type_error() if E_ERROR is passed to
zend_wrong_callback_error().

Remove need to pass error level

Enable throwing custom exceptions from errors

Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).