summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-04-15 18:01:14 +0200
committerJulien Pauli <jpauli@php.net>2014-04-15 18:01:14 +0200
commit8db1ba94e440a6bbb387b3a6b34d1d9235537e55 (patch)
treea42df0627ad6033e9d64357716567603a384b0b2
parentb8d029435dd436487a455a758e8dc10d1c94096e (diff)
downloadphp-git-8db1ba94e440a6bbb387b3a6b34d1d9235537e55.tar.gz
5.5.12RC1php-5.5.12RC1
-rw-r--r--NEWS5
-rw-r--r--configure.in4
-rw-r--r--main/php_version.h8
3 files changed, 7 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index fbc0769c21..b47ed26194 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2014, PHP 5.5.13
-
-
-?? ??? 2014, PHP 5.5.12
+17 Apr 2014, PHP 5.5.12RC1
- Core:
. Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike)
. Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace
diff --git a/configure.in b/configure.in
index 445df76ed2..e63062d2b2 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=13
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=12
+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 4574767493..101cb4b08f 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 13
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.13-dev"
-#define PHP_VERSION_ID 50513
+#define PHP_RELEASE_VERSION 12
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.5.12RC1"
+#define PHP_VERSION_ID 50512