diff options
author | Julien Pauli <jpauli@php.net> | 2014-10-01 16:13:35 +0200 |
---|---|---|
committer | Julien Pauli <jpauli@php.net> | 2014-10-01 16:13:35 +0200 |
commit | f68da34119af90223c7f7118ff6c73f50e9bcdd4 (patch) | |
tree | b81d40f414edae43bd57fd3bcf2baacfcddb598f | |
parent | 25a18c5d7326a99ddb2714c5fdbced8ad09bb7e8 (diff) | |
download | php-git-f68da34119af90223c7f7118ff6c73f50e9bcdd4.tar.gz |
5.5.18RC1
-rw-r--r-- | NEWS | 5 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | main/php_version.h | 4 |
3 files changed, 7 insertions, 4 deletions
@@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2014, PHP 5.5.18 +02 Oct 2014, PHP 5.5.18RC1 - Core: . Fixed bug #67985 (Incorrect last used array index copied to new array after @@ -15,6 +15,9 @@ PHP NEWS . Fixed bug #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache, mod_proxy-fcgi and ProxyPass). (Remi) +- OpenSSL: + . Revert regression introduced by fix of bug #41631 + - Reflection: . Fixed bug #68103 (Duplicate entry in Reflection for class alias). (Remi) diff --git a/configure.in b/configure.in index 92b49006e6..5e8d3d5517 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=5 PHP_RELEASE_VERSION=18 -PHP_EXTRA_VERSION="-dev" +PHP_EXTRA_VERSION="RC1" 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 e7478d5ce6..b68d21d636 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 #define PHP_RELEASE_VERSION 18 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.18-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.5.18RC1" #define PHP_VERSION_ID 50518 |