sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update PHP 7.1 from 7.1.12 to 7.1.13

Browse source 
Changelog: http://www.php.net/ChangeLog-7.php#7.1.13

PR:  224955
MFH: 2018Q1
This commit is contained in:
Torsten Zuehlsdorff 2018-01-10 16:07:02 +00:00
parent 431042928f
commit c687c65114
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=458658
5 changed files with 5 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
archivers/php71-phar/Makefile
View file

@ -2,7 +2,6 @@
CATEGORIES= archivers
PORTREVISION= 2
MASTERDIR= ${.CURDIR}/../../lang/php71
PKGNAMESUFFIX= -phar

4
lang/php71/Makefile
View file

@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= php71
PORTVERSION= 7.1.12
PORTREVISION?= 2
PORTVERSION= 7.1.13
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}

6
lang/php71/distinfo
View file

@ -1,5 +1,5 @@
TIMESTAMP = 1511442089
SHA256 (php-7.1.12.tar.xz) = a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3
SIZE (php-7.1.12.tar.xz) = 12194772
TIMESTAMP = 1515408503
SHA256 (php-7.1.13.tar.xz) = 1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10
SIZE (php-7.1.13.tar.xz) = 12194780
SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7
SIZE (php-7.1.x-mail-header.patch) = 4504

1
www/php71-opcache/Makefile
View file

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

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

@ -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);
}