From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 22 Jan 2019 13:04:03 +0000 (+0100)
Subject: Prepare main branch for PHP 7.3.3
X-Git-Tag: php-7.3.3RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19a9a6ba242776901a1b9cf6b41ff52a9917665e;p=php

Prepare main branch for PHP 7.3.3
---

diff --git a/NEWS b/NEWS
index 656e4ab70e..5f1a7339db 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 7.3.2
+?? ??? ????, PHP 7.3.3
+
+- Opcache:
+  . Fixed bug #77287 (Opcache literal compaction is incompatible with EXT
+    opcodes). (Nikita)
+
+07 Feb 2019, PHP 7.3.2
 
 - Core:
   . Fixed bug #77369 (memcpy with negative length via crafted DNS response). (Stas)
@@ -61,8 +67,6 @@ PHP                                                                        NEWS
     (Nikita)
   . Fixed bug #77361 (configure fails on 64-bit AIX when opcache enabled).
     (Kevin Adler)
-  . Fixed bug #77287 (Opcache literal compaction is incompatible with EXT
-    opcodes). (Nikita)
 
 - PCRE:
   . Fixed bug #77338 (get_browser with empty string). (Nikita)
diff --git a/Zend/zend.h b/Zend/zend.h
index 7e11d53455..8e8053ab7e 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "3.3.2-dev"
+#define ZEND_VERSION "3.3.3-dev"
 
 #define ZEND_ENGINE_3
 
diff --git a/configure.ac b/configure.ac
index 660b43a343..809f783907 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=2
+PHP_RELEASE_VERSION=3
 PHP_EXTRA_VERSION="-dev"
 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 e91794faae..f1799ea9f9 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.ac to change version number */
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 3
-#define PHP_RELEASE_VERSION 2
+#define PHP_RELEASE_VERSION 3
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.3.2-dev"
-#define PHP_VERSION_ID 70302
+#define PHP_VERSION "7.3.3-dev"
+#define PHP_VERSION_ID 70303