summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-02-18 17:14:48 +0100
committerJulien Pauli <jpauli@php.net>2014-02-18 17:14:48 +0100
commit46996a68a3996777bac94cc4af4935e024804267 (patch)
treeecf606d1dd56ed79397b1b682905fd1c45c90d02
parentbd8cd98d6d70ac50dc1de350970ed9ea479895db (diff)
downloadphp-git-46996a68a3996777bac94cc4af4935e024804267.tar.gz
5.5.10RC1php-5.5.10RC1
-rw-r--r--NEWS4
-rw-r--r--configure.in4
-rw-r--r--main/php_version.h8
3 files changed, 8 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 48215ba1ca..49717f4baa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2014, PHP 5.5.10
+20 Fev 2014, PHP 5.5.10RC1
- Core:
. Fixed Request #66574i (Allow multiple paths in php_ini_scanned_path). (Remi)
@@ -10,7 +10,7 @@ PHP NEWS
per offset too). (Derick)
- Fileinfo:
- . Bug #66731 (file: infinite recursion). (Remi)
+ . Bug #66731 (file: infinite recursion) (CVE-2014-1943). (Remi)
- JSON:
. Fixed bug #65753 (JsonSerializeable couldn't implement on module extension)
diff --git a/configure.in b/configure.in
index 1f4080f258..5146819e47 100644
--- a/configure.in
+++ b/configure.in
@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=9
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=10
+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 784ef62e41..6bff68122d 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 5
-#define PHP_RELEASE_VERSION 9
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.9-dev"
-#define PHP_VERSION_ID 50509
+#define PHP_RELEASE_VERSION 10
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.5.10RC1"
+#define PHP_VERSION_ID 50510