delta/php-git.git/ext/openssl, branch php-7.0.8 git.php.net: repository/php-src.git Merge branch 'PHP-5.6.23' into PHP-7.0.8 2016-06-21T07:24:32+00:00 Stanislav Malyshev stas@php.net 2016-06-21T07:24:32+00:00 2a65544f788654946bfe49e114efa748246fdd52 * PHP-5.6.23: (24 commits) iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow update NEWS fix tests fix build Fix bug #72455: Heap Overflow due to integer overflows Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize Fix bug #72407: NULL Pointer Dereference at _gdScaleVert Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free Fix bug #72298 pass2_no_dither out-of-bounds access Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow Fix bug #72262 - do not overflow int Fix bug #72400 and #72403 - prevent signed int overflows for string lengths Fix bug #72275: don't allow smart_str to overflow int Fix bug #72340: Double Free Courruption in wddx_deserialize update NEWS Fix #66387: Stack overflow with imagefilltoborder Fix bug #72321 - use efree() for emalloc allocation 5.6.23RC1 Fix bug #72140 (segfault after calling ERR_free_strings()) ... Conflicts: configure.in ext/mbstring/php_mbregex.c ext/mcrypt/mcrypt.c ext/spl/spl_array.c ext/spl/spl_directory.c ext/standard/php_smart_str.h ext/standard/string.c ext/standard/url.c ext/wddx/wddx.c ext/zip/php_zip.c main/php_version.h 
* PHP-5.6.23: (24 commits)
  iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
  update NEWS
  fix tests
  fix build
  Fix bug #72455:  Heap Overflow due to integer overflows
  Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
  Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
  Fix bug #72298	pass2_no_dither out-of-bounds access
  Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
  Fix bug #72262 - do not overflow int
  Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
  Fix bug #72275: don't allow smart_str to overflow int
  Fix bug #72340: Double Free Courruption in wddx_deserialize
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Fix bug #72321 - use efree() for emalloc allocation
  5.6.23RC1
  Fix bug #72140 (segfault after calling ERR_free_strings())
  ...

Conflicts:
	configure.in
	ext/mbstring/php_mbregex.c
	ext/mcrypt/mcrypt.c
	ext/spl/spl_array.c
	ext/spl/spl_directory.c
	ext/standard/php_smart_str.h
	ext/standard/string.c
	ext/standard/url.c
	ext/wddx/wddx.c
	ext/zip/php_zip.c
	main/php_version.h
Fix bug #72140 (segfault after calling ERR_free_strings()) 2016-06-08T17:21:39+00:00 Jakub Zelenka bukka@php.net 2016-06-08T17:21:39+00:00 05033c9ebd015baf825581e5725a594da277d560 






Merge branch 'PHP-5.6' into PHP-7.0
2016-06-06T06:58:08+00:00

Anatol Belski
ab@php.net

2016-06-06T06:58:08+00:00

174c3371bd8004d27d6c0548afea5ff6f479e2a4

* PHP-5.6:
  fix typo





* PHP-5.6:
  fix typo







fix typo
2016-06-06T06:56:40+00:00

Anatol Belski
ab@php.net

2016-06-06T06:56:40+00:00

eaef8f6db2f80cf49dc5886454ed5789121e889e












Merge branch 'PHP-5.6' into PHP-7.0
2016-06-06T06:21:39+00:00

Anatol Belski
ab@php.net

2016-06-06T06:21:39+00:00

075c75873e73fbc6d1b2124690cdd3628365d570

* PHP-5.6:
  fix broken skipif and add xfail for now





* PHP-5.6:
  fix broken skipif and add xfail for now







fix broken skipif and add xfail for now
2016-06-06T06:20:01+00:00

Anatol Belski
ab@php.net

2016-06-06T06:20:01+00:00

1b2afd478b1c6942643d8af630a352f7fbc59503












Merge branch 'PHP-5.6' into PHP-7.0
2016-06-05T16:30:03+00:00

Jakub Zelenka
bukka@php.net

2016-06-05T16:30:03+00:00

1f7535234ea4c036bc9f94617daa3a8d0a2b1192












Add new test for openssl_pkey_new
2016-06-05T16:27:47+00:00

Jakub Zelenka
bukka@php.net

2016-06-05T16:27:47+00:00

d4615d1118e965be10d7c8b4d627ee90492b646b












Add test for openssl_error_string
2016-06-05T16:23:05+00:00

Jakub Zelenka
bukka@php.net

2016-06-05T16:23:05+00:00

497fe33d6f1bbea5a62a8068169e351eb70d2db6

This test is important for making sure that the error strings
from OpenSSL works as expected and we can safely add a fix
for storing the strings that is prepared.





This test is important for making sure that the error strings
from OpenSSL works as expected and we can safely add a fix
for storing the strings that is prepared.







Remove openssl_x509_parse for OpenSSL 0.9.x
2016-06-05T15:28:50+00:00

Jakub Zelenka
bukka@php.net

2016-06-05T15:28:50+00:00

5e9f3871753516036e05645091280a25225ab5ba

The test is unstable and it actually fails with latest 0.9.8





The test is unstable and it actually fails with latest 0.9.8