Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
fix #72519, possible OOB using imagegif
fix #72512, invalid read or write for palette image when invalid transparent index is used

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
fix #72519, possible OOB using imagegif
fix #72512, invalid read or write for palette image when invalid transparent index is used
Apparently some envs miss SIZE_MAX
Fix tests
Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
Fix bug #72562 - destroy var_hash properly
Fix bug #72533 (locale_accept_from_http out-of-bounds access)
Fix fir bug #72520
Fix for bug #72513
Fix for bug #72513
CS fix and comments with bug ID
Fix for HTTP_PROXY issue.
5.6.24RC1
add tests for bug #72512
Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access
Fixed bug #72479 - same as #72434

Conflicts:
Zend/zend_virtual_cwd.c
ext/bz2/bz2.c
ext/exif/exif.c
ext/session/session.c
ext/snmp/snmp.c
ext/standard/basic_functions.c
main/SAPI.c
main/php_variables.c

show more ...

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix #72519, possible OOB using imagegif
fix #72512, invalid read or write for palette image when invalid transparent index is used

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix #72519, possible OOB using imagegif
fix #72512, invalid read or write for palette image when invalid transparent index is used
Apparently some envs miss SIZE_MAX
Fix tests
Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
Fix bug #72562 - destroy var_hash properly
Fix bug #72533 (locale_accept_from_http out-of-bounds access)
Fix fir bug #72520
Fix for bug #72513
CS fix and comments with bug ID
Fix for HTTP_PROXY issue.
add tests for bug #72512
Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access
Fixed bug #72479 - same as #72434

Conflicts:
ext/bz2/bz2.c
main/SAPI.c
main/php_variables.c

show more ...

Fix bug #72562 - destroy var_hash properly

Merge branch 'throw-error-in-extensions'

Fixed compilation warnings

E_RECOVERABLE_ERROR -> thrown Error

Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error

Merge branch 'master' into throw-error-in-extensions

Merge branch 'PHP-7.0'

Fixed bug #71972 (Cyclic references causing session_start(): Failed to decode session object)

Remove debug code

Merge branch 'PHP-7.0'

* PHP-7.0:
Fixed Bug #71974 Trans sid will always be send, even if cookies are available

Fixed Bug #71974 Trans sid will always be send, even if cookies are available

Merge branch 'PHP-7.0'

* PHP-7.0:
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket

Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket

Merge branch 'PHP-7.0'

* PHP-7.0:
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
Bug #71756 (Call-by-reference widens scope to uninvolved functions whe

Merge branch 'PHP-7.0'

* PHP-7.0:
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

show more ...

Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)

Merge branch 'PHP-7.0'

Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

Also re bug #71575.

check length first, prevent out-of-bounds read

check length first, prevent out-of-bounds read

Merge branch 'PHP-7.0'

* PHP-7.0:
fix wrong gc sequence

fix wrong gc sequence

reset ext/session to the state of 7.0.2

reset the ext/session to the state of 5.6.17