com php-src: Prepare 5.5.12 final: NEWS configure.in main/php_version.h
| From: | JulienPauli | Date: | Tue, 29 Apr 2014 08:04:30 +0000 |
| Subject: | com php-src: Prepare 5.5.12 final: NEWS configure.in main/php_version.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77184@lists.php.net to get a copy of this message | ||
Commit: 58a3e9586b96278b0a108b9c038b6174deba116b
Author: Julien Pauli <jpauli@php.net> Tue, 29 Apr 2014 10:04:30 +0200
Parents: 61b002b91baa78af0b7f438c8c35a51951c650a5
Branches: PHP-5.5.12
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=58a3e9586b96278b0a108b9c038b6174deba116b
Log:
Prepare 5.5.12 final
Changed paths:
M NEWS
M configure.in
M main/php_version.h
Diff:
diff --git a/NEWS b/NEWS
index 30e769e..ed12a39 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 e63062d..3edc367 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 101cb4b..f8ab50e 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