Skip to content
This repository was archived by the owner on Feb 18, 2022. It is now read-only.

Commit 41adca2

Browse files
committed
update to 7.3.0RC2
bump API numbers switch from libpcre to libpcre2 temporarily disable pcre jit on s390x see https://bugzilla.redhat.com/1636032
1 parent 98fbc8e commit 41adca2

File tree

6 files changed

+133
-81
lines changed

6 files changed

+133
-81
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ php-7.1.*.xz
2828
/php-7.2.10RC1.tar.xz
2929
/php-7.2.10.tar.xz
3030
/php-7.2.11RC1.tar.xz
31+
/php-7.3.0RC2.tar.xz

10-opcache.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,15 @@ opcache.max_accelerated_files=4000
4242
; size of the optimized code.
4343
;opcache.save_comments=1
4444

45-
; If enabled, a fast shutdown sequence is used for the accelerated code
46-
; Depending on the used Memory Manager this may cause some incompatibilities.
47-
;opcache.fast_shutdown=0
48-
4945
; Allow file existence override (file_exists, etc.) performance feature.
5046
;opcache.enable_file_override=0
5147

5248
; A bitmask, where each bit enables or disables the appropriate OPcache
5349
; passes
54-
;opcache.optimization_level=0xffffffff
50+
;opcache.optimization_level=0x7FFFBFFF
5551

56-
;opcache.inherited_hack=1
52+
; This hack should only be enabled to work around "Cannot redeclare class"
53+
; errors.
5754
;opcache.dups_fix=0
5855

5956
; The location of the OPcache blacklist file (wildcards allowed).
@@ -128,3 +125,6 @@ opcache.blacklist_filename=/etc/php.d/opcache*.blacklist
128125
; This should improve performance, but requires appropriate OS configuration.
129126
opcache.huge_code_pages=0
130127

128+
; If specified, it produces opcode dumps for debugging different stages of
129+
; optimizations.
130+
;opcache.opt_debug_level=0
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From bbfea4b470f30b3d92ad73e4addf37c3e247052a Mon Sep 17 00:00:00 2001
2+
From: Remi Collet <[email protected]>
3+
Date: Thu, 4 Oct 2018 11:45:35 +0200
4+
Subject: [PATCH] Allow to disable pcre.jit when system library is used as it
5+
is for now broken on some arch (s390x...)
6+
7+
---
8+
ext/pcre/config0.m4 | 16 +++++++++-------
9+
1 file changed, 9 insertions(+), 7 deletions(-)
10+
11+
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
12+
index dd1b7d55aa69..3f7f04d4fc60 100644
13+
--- a/ext/pcre/config0.m4
14+
+++ b/ext/pcre/config0.m4
15+
@@ -47,13 +47,15 @@ PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality
16+
fi
17+
fi
18+
19+
- PHP_CHECK_LIBRARY(pcre2-8, pcre2_jit_compile_8,
20+
- [
21+
- AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ])
22+
- ],[
23+
- ],[
24+
- $PCRE2_LIB
25+
- ])
26+
+ if test "$PHP_PCRE_JIT" != "no"; then
27+
+ PHP_CHECK_LIBRARY(pcre2-8, pcre2_jit_compile_8,
28+
+ [
29+
+ AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ])
30+
+ ],[
31+
+ ],[
32+
+ $PCRE2_LIB
33+
+ ])
34+
+ fi
35+
36+
PHP_EVAL_INCLINE($PCRE2_INC)
37+
PHP_EVAL_LIBLINE($PCRE2_LIB)

0 commit comments

Comments
 (0)