summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-04-11 10:51:55 +0200
committerAnatol Belski <ab@php.net>2017-04-11 10:51:55 +0200
commitfa587915da22f88ea28b53e6b161cf7c607c28df (patch)
treedd87cde9b7884a9115e4909e6595b4b001ff2716
parentc51ecac617aa51083ebd63ddb64c96b4e48e7e49 (diff)
downloadphp-git-PHP-7.0.18.tar.gz
-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 d73dfdc021..2a3c9c4376 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-30 Mar 2017 PHP 7.0.18RC1
+13 Apr 2017 PHP 7.0.18
- Core:
. Fixed bug #73370 (falsely exits with "Out of Memory" when using
diff --git a/configure.in b/configure.in
index b6a969561a..438959e5d6 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=0
PHP_RELEASE_VERSION=18
-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 7ba5e214bb..979bfaf063 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 7
#define PHP_MINOR_VERSION 0
#define PHP_RELEASE_VERSION 18
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "7.0.18RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.0.18"
#define PHP_VERSION_ID 70018