com php-src: 5.4.25: NEWS configure.in main/php_version.h

Commit: fd6e334f4a6275f3434cb3cedfc250a45c534b36 Author: Stanislav Malyshev <stas@php.net> Wed, 5 Feb 2014 00:22:22 -0800 Parents: 08eb524bf25533bbc5373690046b2f874129ccbc Branches: PHP-5.4.25 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd6e334f4a6275f3434cb3cedfc250a45c534b36 Log: 5.4.25 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 536ec7c..e8c8f31 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -23 Jan 2013, PHP 5.4.25 RC1 +06 Feb 2014, PHP 5.4.25 - Core: . Fixed bug #66286 (Incorrect object comparison with inheritance). (Nikita) diff --git a/configure.in b/configure.in index 47a4a68..fbcc764 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=25 -PHP_EXTRA_VERSION="RC1" +PHP_EXTRA_VERSION="" 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 --git a/main/php_version.h b/main/php_version.h index 3e7e090..2bef4c3 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 25 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.4.25RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.4.25" #define PHP_VERSION_ID 50425