[php-src] master: Merge branch 'PHP-8.6'
| From: | Matteo Beccati | Date: | Tue, 10 Nov 2026 16:56:13 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.6' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-143548@lists.php.net to get a copy of this message | ||
Author: Matteo Beccati (mbeccati)
Date: 2026-11-10T17:53:09+01:00
Commit: https://github.com/php/php-src/commit/c6f3a3ddbb14c5926b853f7c7cc5182a7b63b947
Raw diff: https://github.com/php/php-src/commit/c6f3a3ddbb14c5926b853f7c7cc5182a7b63b947.diff
Merge branch 'PHP-8.6'
* PHP-8.6:
[ci skip] Updated NEWS
Bump API version numbers
Changed paths:
M Zend/zend_extensions.h
M Zend/zend_modules.h
M main/php.h
Diff:
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index b8a384a1f544..4e70759f47d5 100644
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -43,7 +43,7 @@ You can use the following macro to check the extension API version for compatibi
/* The first number is the engine version and the rest is the date (YYYYMMDD).
* This way engine 2/3 API no. is always greater than engine 1 API no.. */
-#define ZEND_EXTENSION_API_NO 420260925
+#define ZEND_EXTENSION_API_NO 420261113
typedef struct _zend_extension_version_info {
int zend_extension_api_no;
diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index bb3050927992..945205c4f478 100644
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -30,7 +30,7 @@
#define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module
#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module
-#define ZEND_MODULE_API_NO 20260925
+#define ZEND_MODULE_API_NO 20261113
#ifdef ZTS
#define USING_ZTS 1
#else
diff --git a/main/php.h b/main/php.h
index 2b72f04d604f..dbf298b10a1d 100644
--- a/main/php.h
+++ b/main/php.h
@@ -20,7 +20,7 @@
#include <dmalloc.h>
#endif
-#define PHP_API_VERSION 20260925
+#define PHP_API_VERSION 20261113
#define YYDEBUG 0
#define PHP_DEFAULT_CHARSET "UTF-8"