summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-05-12 08:56:24 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-05-12 08:56:24 +0200
commit47a2da69519b9ed2c10c679edbc4f559d2409f4c (patch)
treea6398115ec452894ebbbfb1c9fb43753f46cc2c2
parentcb265a0addf15c5cf0c029f167a9de030150cf15 (diff)
downloadphp-git-47a2da69519b9ed2c10c679edbc4f559d2409f4c.tar.gz
Bump version
-rw-r--r--NEWS12
-rw-r--r--Zend/zend.h2
-rw-r--r--configure.ac2
-rw-r--r--main/php_version.h4
4 files changed, 9 insertions, 11 deletions
diff --git a/NEWS b/NEWS
index 73e8133a56..1376032735 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 7.3.18
-
-- SimpleXML:
- . Fixed bug #79528 (Different object of the same xml between 7.4.5 and
- 7.4.4). (cmb)
-
-30 Apr 2020, PHP 7.3.18RC1
+14 May 2020, PHP 7.3.18
- Core:
. Fixed bug #79434 (PHP 7.3 and PHP-7.4 crash with NULL-pointer dereference
@@ -35,6 +29,10 @@ PHP NEWS
- Phar:
. Fix bug #79503 (Memory leak on duplicate metadata). (cmb)
+- SimpleXML:
+ . Fixed bug #79528 (Different object of the same xml between 7.4.5 and
+ 7.4.4). (cmb)
+
- Standard:
. Fixed bug #79468 (SIGSEGV when closing stream handle with a stream filter
appended). (dinosaur)
diff --git a/Zend/zend.h b/Zend/zend.h
index 26a47c7fae..d09567b5b2 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -20,7 +20,7 @@
#ifndef ZEND_H
#define ZEND_H
-#define ZEND_VERSION "3.3.18RC1"
+#define ZEND_VERSION "3.3.18"
#define ZEND_ENGINE_3
diff --git a/configure.ac b/configure.ac
index e2c667fb54..5dfcebecac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=3
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 73633552e4..527a7ee22b 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 7
#define PHP_MINOR_VERSION 3
#define PHP_RELEASE_VERSION 18
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "7.3.18RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.3.18"
#define PHP_VERSION_ID 70318