diff options
-rw-r--r-- | ext/pcre/php_pcre.c | 9 | ||||
-rw-r--r-- | ext/pcre/tests/check_jit_enabled.phpt | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index baf9941764..c255fd9174 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -132,9 +132,18 @@ PHP_INI_END() /* {{{ PHP_MINFO_FUNCTION(pcre) */ static PHP_MINFO_FUNCTION(pcre) { + int jit_yes = 0; + php_info_print_table_start(); php_info_print_table_row(2, "PCRE (Perl Compatible Regular Expressions) Support", "enabled" ); php_info_print_table_row(2, "PCRE Library Version", pcre_version() ); + + if (!pcre_config(PCRE_CONFIG_JIT, &jit_yes)) { + php_info_print_table_row(2, "PCRE JIT Support", jit_yes ? "enabled" : "disabled"); + } else { + php_info_print_table_row(2, "PCRE JIT Support", "unknown" ); + } + php_info_print_table_end(); DISPLAY_INI_ENTRIES(); diff --git a/ext/pcre/tests/check_jit_enabled.phpt b/ext/pcre/tests/check_jit_enabled.phpt new file mode 100644 index 0000000000..9cdab2b1d3 --- /dev/null +++ b/ext/pcre/tests/check_jit_enabled.phpt @@ -0,0 +1,14 @@ +--TEST-- +Check for JIT enablement status +--FILE-- +<?php + +ob_start(); +phpinfo(); +$info = ob_get_contents(); +ob_end_clean(); + +var_dump(preg_match(",PCRE JIT Support .* enabled,", $info)); +?> +--EXPECT-- +int(1) |