From 88a7b74be6b654bb8445bf8cd719d8e5aec341e7 Mon Sep 17 00:00:00 2001 From: matyhtf Date: Mon, 23 Dec 2024 16:11:50 +0800 Subject: [PATCH] Remove PCRE detection, fix #5625 --- config.m4 | 1 - ext-src/php_swoole.cc | 5 ----- 2 files changed, 6 deletions(-) diff --git a/config.m4 b/config.m4 index 701eaa569a..63a3f23076 100644 --- a/config.m4 +++ b/config.m4 @@ -373,7 +373,6 @@ if test "$PHP_SWOOLE" != "no"; then AC_CHECK_LIB(pthread, pthread_mutexattr_setpshared, AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETPSHARED, 1, [have pthread_mutexattr_setpshared])) AC_CHECK_LIB(pthread, pthread_mutexattr_setrobust, AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETROBUST, 1, [have pthread_mutexattr_setrobust])) AC_CHECK_LIB(pthread, pthread_mutex_consistent, AC_DEFINE(HAVE_PTHREAD_MUTEX_CONSISTENT, 1, [have pthread_mutex_consistent])) - AC_CHECK_LIB(pcre, pcre_compile, AC_DEFINE(HAVE_PCRE, 1, [have pcre])) if test "$PHP_SWOOLE_DEV" = "yes"; then AX_CHECK_COMPILE_FLAG(-Wbool-conversion, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wbool-conversion") diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc index 1653abcf47..9315f70f52 100644 --- a/ext-src/php_swoole.cc +++ b/ext-src/php_swoole.cc @@ -23,9 +23,7 @@ BEGIN_EXTERN_C() #include "zend_exceptions.h" #include "zend_extensions.h" -#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) #include "ext/pcre/php_pcre.h" -#endif #include "ext/json/php_json.h" #include "stubs/php_swoole_arginfo.h" @@ -914,9 +912,6 @@ PHP_MINFO_FUNCTION(swoole) { #ifdef SW_USE_CURL php_info_print_table_row(2, "curl-native", "enabled"); #endif -#ifdef HAVE_PCRE - php_info_print_table_row(2, "pcre", "enabled"); -#endif #ifdef SW_USE_CARES php_info_print_table_row(2, "c-ares", ares_version(nullptr)); #endif