Commit: 53d96434313f245e07990ea910820b102a9bc3d7 Author: Stanislav Malyshev <s...@php.net> Mon, 19 Aug 2013 23:23:21 -0700 Parents: 1a00b9bd264ba2495930be05cd0ed2b1c13b8ef8 d487f5e9acc55fb76d71c40e451efebbc087af35 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=53d96434313f245e07990ea910820b102a9bc3d7 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: bump version Update NEWS Conflicts: configure.in main/php_version.h Changed paths: MM NEWS MM configure.in MM main/php_version.h Diff: diff --cc NEWS index 645efed,aeae233..f71f952 --- a/NEWS +++ b/NEWS @@@ -1,28 -1,13 +1,33 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| - ?? ??? 2013, PHP 5.5.3 -?? ??? 2013, PHP 5.4.20 ++?? ??? 2013, PHP 5.5.4 - Core: - . Fixed bug #65481 (shutdown segfault due to serialize) (Mike) - . Fixed bug #65470 (Segmentation fault in zend_error() with + . Fixed bug #65470 (Segmentation fault in zend_error() with --enable-dtrace). (Chris Jones, Kris Van Hees) + . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert) + . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van Hees) + +- cURL: + . Fixed bug #65458 (curl memory leak). (Adam) + +- Openssl: + . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in + some cases). (Mark Jones) + ++22 Aug 2013, PHP 5.5.3 ++ ++- Openssl: ++ . Fixed UMR in fix for CVE-2013-4248. ++ +15 Aug 2013, PHP 5.5.2 + +- Core: . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference fails). (Laruence) + . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was + erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey + avp200681 gmail com). . Fixed bug #65304 (Use of max int in array_sum). (Laruence) . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very limited case). (Arpad) diff --cc configure.in index 19c96d4,9a99680..47ce23c --- a/configure.in +++ b/configure.in @@@ -118,8 -118,8 +118,8 @@@ int zend_sprintf(char *buffer, const ch ]) PHP_MAJOR_VERSION=5 -PHP_MINOR_VERSION=4 -PHP_RELEASE_VERSION=20 +PHP_MINOR_VERSION=5 - PHP_RELEASE_VERSION=2 ++PHP_RELEASE_VERSION=4 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --cc main/php_version.h index e760d29,9dc0023..4a538a4 --- 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 4 -#define PHP_RELEASE_VERSION 20 +#define PHP_MINOR_VERSION 5 - #define PHP_RELEASE_VERSION 2 ++#define PHP_RELEASE_VERSION 4 #define PHP_EXTRA_VERSION "-dev" - #define PHP_VERSION "5.5.2-dev" - #define PHP_VERSION_ID 50502 -#define PHP_VERSION "5.4.20-dev" -#define PHP_VERSION_ID 50420 ++#define PHP_VERSION "5.5.4-dev" ++#define PHP_VERSION_ID 50504 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
