diff options
| author | Remi Collet <remi@remirepo.net> | 2022-06-21 16:04:26 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2022-06-21 16:04:26 +0200 |
| commit | dc674bb16fe83580076c68cdd0938f73411d6710 (patch) | |
| tree | a8e0ab9c8d4302c5f87fe59c80142463efa49faf /php-mbstring.patch | |
| parent | 19756c0c6420fa5a459277e8af41926f6bbe838c (diff) | |
update to 8.0.21RC1
Diffstat (limited to 'php-mbstring.patch')
| -rw-r--r-- | php-mbstring.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/php-mbstring.patch b/php-mbstring.patch deleted file mode 100644 index 7da512b..0000000 --- a/php-mbstring.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2eb2f9d74f22bf35a4915ec95afc53a47ebf1af9 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 2 Jun 2022 08:05:22 +0200 -Subject: [PATCH] Fix GH-8685 mbstring requires pcre - ---- - ext/mbstring/mbstring.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c -index 48f22a682a19..4a4088aed3fb 100644 ---- a/ext/mbstring/mbstring.c -+++ b/ext/mbstring/mbstring.c -@@ -161,9 +161,18 @@ static const php_mb_nls_ident_list php_mb_default_identify_list[] = { - - /* }}} */ - -+/* {{{ mbstring_deps[] */ -+static const zend_module_dep mbstring_deps[] = { -+ ZEND_MOD_REQUIRED("pcre") -+ ZEND_MOD_END -+}; -+/* }}} */ -+ - /* {{{ zend_module_entry mbstring_module_entry */ - zend_module_entry mbstring_module_entry = { -- STANDARD_MODULE_HEADER, -+ STANDARD_MODULE_HEADER_EX, -+ NULL, -+ mbstring_deps, - "mbstring", - ext_functions, - PHP_MINIT(mbstring), |