com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS main/php_version.h

Commit: 890b3987ab55ede805d2d7703d1da46facc63819 Author: Stanislav Malyshev <stas@php.net> Tue, 17 Mar 2015 17:08:28 -0700 Parents: dbd1d79b68f443b3d13da3571f6f70ae3fbc0aa3 c83dd84ad6797dbf4308a451873597ac337e4b96 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=890b3987ab55ede805d2d7703d1da46facc63819 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fix bug #69248 - heap overflow vulnerability in regcomp.c add test for bug #68976 Bugs: https://bugs.php.net/69248 https://bugs.php.net/68976 Changed paths: MM NEWS MM main/php_version.h Diff: diff --cc NEWS index a047cad,d8c965f..c0e2e04 --- a/NEWS +++ b/NEWS @@@ -19,8 -21,11 +19,11 @@@ PH . Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows builds). (Anatol) + - Ereg: + . Fixed bug #69248 (heap overflow vulnerability in regcomp.c). (Stas) + - Filter: - . Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other + . Fixed bug #69202: (FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used). (Jeff Welch) . Fixed bug #69203 (FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127). (Jeff Welch) diff --cc main/php_version.h index 959e7ce,2997684..ed1e351 --- a/main/php_version.h +++ b/main/php_version.h @@@ -1,8 -1,8 +1,8 @@@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 -#define PHP_MINOR_VERSION 5 -#define PHP_RELEASE_VERSION 24 +#define PHP_MINOR_VERSION 6 - #define PHP_RELEASE_VERSION 8 ++#define PHP_RELEASE_VERSION 6 #define PHP_EXTRA_VERSION "-dev" - #define PHP_VERSION "5.6.8-dev" - #define PHP_VERSION_ID 50608 -#define PHP_VERSION "5.5.24-dev" -#define PHP_VERSION_ID 50524 ++#define PHP_VERSION "5.6.6-dev" ++#define PHP_VERSION_ID 50606