summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-04-29 10:04:30 +0200
committerJulien Pauli <jpauli@php.net>2014-04-29 10:04:30 +0200
commit58a3e9586b96278b0a108b9c038b6174deba116b (patch)
tree53d4b0f87404ded20f9c1605576210c8d0a1ebce
parent61b002b91baa78af0b7f438c8c35a51951c650a5 (diff)
downloadphp-git-PHP-5.5.12.tar.gz
Prepare 5.5.12 finalphp-5.5.12PHP-5.5.12
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 30e769e84f..ed12a39de4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-17 Apr 2014, PHP 5.5.12RC1
+01 May 2014, PHP 5.5.12
- 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 e63062d2b2..3edc3675df 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=12
-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 101cb4b08f..f8ab50eda6 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 12
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.12RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.12"
#define PHP_VERSION_ID 50512