archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Revert "Fix #81424: PCRE2 10.35 JIT performance regression"
This commit is contained in:
Christoph M. Becker 2021-10-05 11:51:27 +02:00
commit 34cd6cbfe0
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -10,6 +10,9 @@ PHP NEWS
Doleček)
. Fixed bug #81380 (Observer may not be initialized properly). (krakjoe)
- PCRE:
. Unfixed bug #81424 (PCRE2 10.35 JIT performance regression). (cmb)
- Standard:
. Fixed bug #81491 (Incorrectly using libsodium for argon2 hashing).
(Dan Pock)

2
ext/pcre/pcre2lib/pcre2_jit_compile.c
View file

@ -11228,7 +11228,7 @@ early_fail_type = (early_fail_ptr & 0x7);
early_fail_ptr >>= 3;
/* During recursion, these optimizations are disabled. */
if (common->early_fail_start_ptr == 0 && common->fast_forward_bc_ptr == NULL)
if (common->early_fail_start_ptr == 0)
{
early_fail_ptr = 0;
early_fail_type = type_skip;