From d1c1481081ef6280bf403b290501ca62d736cb8b Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 5 Feb 2019 10:43:25 +0100 Subject: Unbundle oniguruma And also switch detection over to pkg-config. --- ext/mbstring/php_mbregex.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'ext/mbstring/php_mbregex.c') diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 64b932a3c2..30ff0b34b9 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -158,13 +158,6 @@ PHP_MINFO_FUNCTION(mb_regex) ONIGURUMA_VERSION_MAJOR, ONIGURUMA_VERSION_MINOR, ONIGURUMA_VERSION_TEENY); -#ifdef PHP_ONIG_BUNDLED -#ifdef USE_COMBINATION_EXPLOSION_CHECK - php_info_print_table_row(2, "Multibyte regex (oniguruma) backtrack check", "On"); -#else /* USE_COMBINATION_EXPLOSION_CHECK */ - php_info_print_table_row(2, "Multibyte regex (oniguruma) backtrack check", "Off"); -#endif /* USE_COMBINATION_EXPLOSION_CHECK */ -#endif /* PHP_BUNDLED_ONIG */ php_info_print_table_row(2, "Multibyte regex (oniguruma) version", buf); php_info_print_table_end(); } -- cgit v1.2.1 From e91d8ac5f6210c7283795b9b7b5ee90576d1bfa7 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 5 Feb 2019 13:56:13 +0100 Subject: Add MB_ONIGURUMA_VERSION and use it in a version dependent test --- ext/mbstring/php_mbregex.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ext/mbstring/php_mbregex.c') diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 30ff0b34b9..5128fabc34 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -105,7 +105,13 @@ void php_mb_regex_globals_free(zend_mb_regex_globals *pglobals) /* {{{ PHP_MINIT_FUNCTION(mb_regex) */ PHP_MINIT_FUNCTION(mb_regex) { + char version[256]; + onig_init(); + + snprintf(version, sizeof(version), "%d.%d.%d", + ONIGURUMA_VERSION_MAJOR, ONIGURUMA_VERSION_MINOR, ONIGURUMA_VERSION_TEENY); + REGISTER_STRING_CONSTANT("MB_ONIGURUMA_VERSION", version, CONST_CS | CONST_PERSISTENT); return SUCCESS; } /* }}} */ -- cgit v1.2.1