Attachment 189469 Details for Bug 224955 – patch

[patch] patch

php7.1.13.diff (text/plain), 3.54 KB, created by Jochen Neumeister on 2018-01-06 20:16:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jochen Neumeister

Created: 2018-01-06 20:16:11 UTC

Size: 3.54 KB

patch

obsolete

>Index: archivers/php71-phar/Makefile
>===================================================================
>--- archivers/php71-phar/Makefile	(revision 458279)
>+++ archivers/php71-phar/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> 
> CATEGORIES=	archivers
> 
>-PORTREVISION=	2
> MASTERDIR=	${.CURDIR}/../../lang/php71
> 
> PKGNAMESUFFIX=	-phar
>Index: lang/php71/Makefile
>===================================================================
>--- lang/php71/Makefile	(revision 458279)
>+++ lang/php71/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	php71
>-PORTVERSION=	7.1.12
>-PORTREVISION?=	2
>+PORTVERSION=	7.1.13
> CATEGORIES?=	lang devel www
> MASTER_SITES=	PHP/distributions
> DISTNAME=	php-${PORTVERSION}
>Index: lang/php71/distinfo
>===================================================================
>--- lang/php71/distinfo	(revision 458279)
>+++ lang/php71/distinfo	(working copy)
>@@ -1,5 +1,3 @@
>-TIMESTAMP = 1511442089
>-SHA256 (php-7.1.12.tar.xz) = a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3
>-SIZE (php-7.1.12.tar.xz) = 12194772
>-SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7
>-SIZE (php-7.1.x-mail-header.patch) = 4504
>+TIMESTAMP = 1515264588
>+SHA256 (php-7.1.13.tar.xz) = 1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10
>+SIZE (php-7.1.13.tar.xz) = 12194780
>Index: www/php71-opcache/Makefile
>===================================================================
>--- www/php71-opcache/Makefile	(revision 458279)
>+++ www/php71-opcache/Makefile	(working copy)
>@@ -4,7 +4,6 @@
> 
> MASTERDIR=	${.CURDIR}/../../lang/php71
> 
>-PORTREVISION=	2
> PKGNAMESUFFIX=	-opcache
> 
> USES=	php:zend
>Index: www/php71-opcache/files/patch-Optimizer_zend__inference.c
>===================================================================
>--- www/php71-opcache/files/patch-Optimizer_zend__inference.c	(revision 458279)
>+++ www/php71-opcache/files/patch-Optimizer_zend__inference.c	(nonexistent)
>@@ -1,30 +0,0 @@
>---- 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);
>- 			}
>
>Property changes on: www/php71-opcache/files/patch-Optimizer_zend__inference.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 224955: 189469