mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-18 03:46:03 +00:00
Code Issues Releases Activity

www/php71-opcache: Fix upstream bugs causing problems with nextcloud

Browse Source 
The bug floods the error logs of not only Nextcloud, but also
Magento and some other applications. While there is already a fix
the next PHP Release is expected at the end of January.

Therefore add the upstream patches.

More details can be found here:
https://bugs.php.net/bug.php?id=75570
https://bugs.php.net/bug.php?id=75608

Reported by: Troels Just <troels@troelsjust.dk>
MFH:         2017Q4
This commit is contained in:
Torsten Zuehlsdorff 2017-12-14 11:11:27 +00:00
parent 80412434ed
commit 98119011bc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=456288
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/php71-opcache/Makefile
View File

@ -4,6 +4,7 @@ CATEGORIES= www
MASTERDIR= ${.CURDIR}/../../lang/php71
PORTREVISION= 2
PKGNAMESUFFIX= -opcache
USES= php:zend

30
www/php71-opcache/files/patch-Optimizer_zend__inference.c Normal file
View File

@ -0,0 +1,30 @@
--- Optimizer/zend_inference.c.orig 2017-12-12 12:05:15 UTC
+++ Optimizer/zend_inference.c
@@ -2928,7 +2928,7 @@ static int zend_update_type_info(const z
break;
case ZEND_FE_FETCH_R:
case ZEND_FE_FETCH_RW:
- tmp = (t2 & MAY_BE_REF);
+ tmp = t2;
if (t1 & MAY_BE_OBJECT) {
if (opline->opcode == ZEND_FE_FETCH_RW) {
tmp |= MAY_BE_REF | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
@@ -2953,7 +2953,7 @@ static int zend_update_type_info(const z
}
UPDATE_SSA_TYPE(tmp, ssa_ops[i].op2_def);
if (ssa_ops[i].result_def >= 0) {
- tmp = 0;
+ tmp = (ssa_ops[i].result_use >= 0) ? RES_USE_INFO() : 0;
if (t1 & MAY_BE_OBJECT) {
tmp |= MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
}
@@ -3079,7 +3079,8 @@ static int zend_update_type_info(const z
UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def);
} else {
/* invalid key type */
- UPDATE_SSA_TYPE(t1, ssa_ops[i].op1_def);
+ tmp = (tmp & (MAY_BE_RC1|MAY_BE_RCN)) | (t1 & ~(MAY_BE_RC1|MAY_BE_RCN));
+ UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def);
}
COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def);
}