From owner-svn-ports-all@freebsd.org Thu Dec 14 11:11:28 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BBCC9EA015B; Thu, 14 Dec 2017 11:11:28 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F7CF7F361; Thu, 14 Dec 2017 11:11:28 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBEBBRmV027241; Thu, 14 Dec 2017 11:11:27 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBEBBR42027239; Thu, 14 Dec 2017 11:11:27 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201712141111.vBEBBR42027239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Thu, 14 Dec 2017 11:11:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456288 - in head/www/php71-opcache: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in head/www/php71-opcache: . files X-SVN-Commit-Revision: 456288 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Dec 2017 11:11:28 -0000 Author: tz Date: Thu Dec 14 11:11:27 2017 New Revision: 456288 URL: https://svnweb.freebsd.org/changeset/ports/456288 Log: www/php71-opcache: Fix upstream bugs causing problems with nextcloud 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 MFH: 2017Q4 Added: head/www/php71-opcache/files/patch-Optimizer_zend__inference.c (contents, props changed) Modified: head/www/php71-opcache/Makefile Modified: head/www/php71-opcache/Makefile ============================================================================== --- head/www/php71-opcache/Makefile Thu Dec 14 10:58:46 2017 (r456287) +++ head/www/php71-opcache/Makefile Thu Dec 14 11:11:27 2017 (r456288) @@ -4,6 +4,7 @@ CATEGORIES= www MASTERDIR= ${.CURDIR}/../../lang/php71 +PORTREVISION= 2 PKGNAMESUFFIX= -opcache USES= php:zend Added: head/www/php71-opcache/files/patch-Optimizer_zend__inference.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/php71-opcache/files/patch-Optimizer_zend__inference.c Thu Dec 14 11:11:27 2017 (r456288) @@ -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); + }