Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
fix memory leak & add test
Fix tests

fix memory leak & add test

Fix tests

fix CVE num

Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test

Merge branch 'PHP-5.5-security' into PHP-5.5.24

* PHP-5.5-security: (22 commits)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bu

Merge branch 'PHP-5.5-security' into PHP-5.5.24

* PHP-5.5-security: (22 commits)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
updated NEWS
added test for bug #69354
revert skipif, this should run everywhere
further ODBC 3.0 compliance
more compliance with the ODBC 3.0
test fixes
Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.
sigh, can't even copypaste without screwing up
oop, put both the error number and message for both db object to the error message
test fixes
Fixed bug #69281 (opcache_is_script_cached no longer works)
Fix typo: unitialized -> uninitialized
Fix typo: unitialized -> uninitialized
Fixed bug #68739 (Missing break / control flow). Fixed bug #68740 (NULL Pointer Dereference). Fixed bug #68677 (Use After Free).
Fixed bug #68739 (Missing break / control flow in curl)
Fixed bug #68740 (NULL Pointer Dereference)
Fixed bug #68677 (Use After Free in OPcache)
...

Conflicts:
configure.in
ext/curl/tests/bug69316.phpt
main/php_version.h

show more ...

Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)

Fix test

Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in vari

Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
Fixed bug #68901 (use after free)
Fixed bug #68740 (NULL Pointer Dereference)
Fix bug #66550 (SQLite prepared statement use-after-free)
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
Fix bug #68601 buffer read overflow in gd_gif_in.c
Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
Fixed bug #69293
Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.

show more ...

Additional fix for bug #69324

Not so happy about duplication but needed due to bug #69429

More fixes for bug #69152

Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)

Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)

Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)

Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)

Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)

Fixed bug #68901 (use after free)

Fixed bug #69420 (Invalid read in zend_std_get_method)

Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

fix irc notification for build failure/recover

Fixed typo

Fix bug #60022

Fix static member destruction

Fixed bug #68652 (segmentation fault in destructor)