archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source
This commit is contained in:
Nikita Popov 2019-10-04 16:04:34 +02:00
commit 01b3cc4dee
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/pcre/php_pcre.c
View file

@ -801,6 +801,12 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex)
if (!pcre2_pattern_info(re, PCRE2_INFO_JITSIZE, &jit_size) && jit_size > 0) {
poptions |= PREG_JIT;
}
} else if (rc == PCRE2_ERROR_NOMEMORY) {
php_error_docref(NULL, E_WARNING,
"Allocation of JIT memory failed, PCRE JIT will be disabled. "
"This is likely caused by security restrictions. "
"Either grant PHP permission to allocate executable memory, or set pcre.jit=0");
PCRE_G(jit) = 0;
} else {
pcre2_get_error_message(rc, error, sizeof(error));
php_error_docref(NULL, E_WARNING, "JIT compilation failed: %s", error);