import php-7.4.19-1.module+el8.5.0+11143+cc873159
This commit is contained in:
CentOS Sources
parent
06893ad3a7
commit
edea822eb2
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/php-7.4.6.tar.xz
|
||||
SOURCES/php-7.4.19.tar.xz
|
||||
SOURCES/php-keyring.gpg
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
3bde846e02311b1d057f759a334f6a024047b88e SOURCES/php-7.4.6.tar.xz
|
||||
1007577f0d50a514b16e87e7662306ee4a14225c SOURCES/php-7.4.19.tar.xz
|
||||
35368de1a0a6ffc21e7154b57cac461d99fba7c2 SOURCES/php-keyring.gpg
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up php-7.2.4RC1/configure.ac.fixheader php-7.2.4RC1/configure.ac
|
||||
--- php-7.2.4RC1/configure.ac.fixheader 2018-03-13 12:42:47.594623100 +0100
|
||||
+++ php-7.2.4RC1/configure.ac 2018-03-13 12:43:35.591871825 +0100
|
||||
@@ -1275,7 +1275,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d`
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
|
||||
|
||||
-PHP_UNAME=`uname -a | xargs`
|
||||
+PHP_UNAME=`uname | xargs`
|
||||
AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
|
||||
PHP_OS=`uname | xargs`
|
||||
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
|
||||
16
SOURCES/php-7.4.19.tar.xz.asc
Normal file
16
SOURCES/php-7.4.19.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEWlKIB4H3VWCL+BX8kQ3rRvU+oxIFAmCRK6EACgkQkQ3rRvU+
|
||||
oxIK6xAA6F+gXg4rh61svifxkt8J0w1L8vDSjFr+9V8v5pFa3qORK+e1AQ9DjySK
|
||||
BmtjcjlWCO+QYl65mopliZFkuf4GmexxR4pBc2CRp8IeS2eTu97kzyfwzuWsGKVN
|
||||
zu1lwVtyzk171QzOUfVTa37LL+fWoDFp+srtPZCfHw8Kw1R2zuSh9IMO9zXLvxLF
|
||||
1RulR05yfv3wEbE91NqlS0obhLcvjVPdzS2bh94UdrvQd+oCSU0DSlc9Hzml6TbI
|
||||
Ypk4EqiO4O53qfQBp1qehCfVtMrfod9h874jYSQuM+3szZJw5y2OLi4d+GMTWDCd
|
||||
FZXJYnpSS9qPSsMrRFnKEbm/3w3cTD+y8ys82ONekNaNPYQeOCeq+mee+GkSwF5P
|
||||
jElw997uxvR7qZmDheXvZkXLtRoGt7TJtL88uedzqMY78PgLcW9+PLyV32aqAi7v
|
||||
W7GFLfVpqhEmImwsuvOwckAgt+y1B+g6wDpJ7hitOKLq6x8gydxBos4iBYsicKW7
|
||||
o2UXoS1Hkwha0EZf3hBmBQ7jKivZ1rM6zAFDMYepFQ8lVAzo48WbxCiBvvUuVin6
|
||||
TM1kivfYA2OOlD3d77oyHY7suwU7/NHg+HhSmAs8VgBaIdrER1vY1UK2GXhD29Rr
|
||||
R550ofXcRsGwiFS+/IzVL22QVil71QmUodRcGp/7E5QuwrNoBfI=
|
||||
=NYzh
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEWlKIB4H3VWCL+BX8kQ3rRvU+oxIFAl66Wf8ACgkQkQ3rRvU+
|
||||
oxL/6hAAgoveEJIRf/oP3lUBtUB734TYCKID76kIrtkdzCbnTIsX5talte/cUQPz
|
||||
k1mIU2+7vGRE6Lmfd0BmxbIE1AMzoyxa05BaMYzUSOVPUYbnQUWrBoTBAUYUWXDB
|
||||
nDCeFlpSOxHfpwS63uMoEHHN7OC89M/DtbTB15gTNKsuHyv3ekXfEiwGG5n/Vlxo
|
||||
NpwxA5Op4WYQ/M4cJJzArRLgTFRIeQaPht6MocwlIxHxFlMRGCKrRDtkyS57uWoO
|
||||
cWjrQZ+8EAdbzaS65ltZoViky7jeblBIhtfig+I8eEnUrFWkG+5L01H8LRp+we0n
|
||||
vq1eeVhrHDr+O0V7ZF6xfPs+234Q0jLGNN0/j1GC4DPgU/XVUL3RXQu+maWxdulc
|
||||
67cM155EdGKJ1D+8cwJauSbJwSxBkHVgQT0fjCDvtJjRoBfMXerjXfHm+b5t1WLx
|
||||
M9pKiB2bFB+hZAsH7dTOu7o91MoJOEbJrCRfDw/ZdKDGOPJRGl0z9riG/PoQBiEM
|
||||
BfEkFAmUkWYB4J0A+lopoyvGlLTJxRbBpAq2BajIcrccJtl34z87K2s6NPNm2sis
|
||||
nuMy5V5ppAcVjs2LY/rnsHS3bFBiWu78CRKxCC2g069++b3vSWkyHAn9vuPJwfY0
|
||||
dgdaQtzF99CNsGck3uhsKmSq52RE4MmeqtGBWeAu6Smw5ghpqeQ=
|
||||
=3hBG
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,55 +0,0 @@
|
||||
From d87b0685b5ec4e5df6d732414653f343bc44af8c Mon Sep 17 00:00:00 2001
|
||||
From: Nikita Popov <nikita.ppv@gmail.com>
|
||||
Date: Fri, 15 May 2020 11:03:05 +0200
|
||||
Subject: [PATCH] Fixed bug #79600
|
||||
|
||||
Missed unsetting of DO_INIT in one case.
|
||||
---
|
||||
NEWS | 4 ++++
|
||||
Zend/tests/generators/bug79600.phpt | 24 ++++++++++++++++++++++++
|
||||
Zend/zend_generators.c | 1 +
|
||||
3 files changed, 29 insertions(+)
|
||||
create mode 100644 Zend/tests/generators/bug79600.phpt
|
||||
|
||||
diff --git a/Zend/tests/generators/bug79600.phpt b/Zend/tests/generators/bug79600.phpt
|
||||
new file mode 100644
|
||||
index 000000000000..4abe9784b694
|
||||
--- /dev/null
|
||||
+++ b/Zend/tests/generators/bug79600.phpt
|
||||
@@ -0,0 +1,24 @@
|
||||
+--TEST--
|
||||
+Bug #79600: Regression in 7.4.6 when yielding an array based generator
|
||||
+--FILE--
|
||||
+<?php
|
||||
+
|
||||
+function createArrayGenerator() {
|
||||
+ yield from [
|
||||
+ 1,
|
||||
+ 2,
|
||||
+ ];
|
||||
+}
|
||||
+
|
||||
+function createGeneratorFromArrayGenerator() {
|
||||
+ yield from createArrayGenerator();
|
||||
+}
|
||||
+
|
||||
+foreach (createGeneratorFromArrayGenerator() as $value) {
|
||||
+ echo $value, "\n";
|
||||
+}
|
||||
+
|
||||
+?>
|
||||
+--EXPECT--
|
||||
+1
|
||||
+2
|
||||
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
|
||||
index 9d8546f5185b..4cd9087303a3 100644
|
||||
--- a/Zend/zend_generators.c
|
||||
+++ b/Zend/zend_generators.c
|
||||
@@ -792,6 +792,7 @@ ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
|
||||
|
||||
if (UNEXPECTED(!Z_ISUNDEF(generator->values))) {
|
||||
if (EXPECTED(zend_generator_get_next_delegated_value(generator) == SUCCESS)) {
|
||||
+ orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
|
||||
return;
|
||||
}
|
||||
/* If there are no more deletegated values, resume the generator
|
||||
@ -1,74 +0,0 @@
|
||||
From df2db7fceaff4f46909f1aa8b31f0a9010631fc9 Mon Sep 17 00:00:00 2001
|
||||
From: Nikita Popov <nikita.ppv@gmail.com>
|
||||
Date: Mon, 8 Jun 2020 11:31:28 +0200
|
||||
Subject: [PATCH] Fixed bug #79657
|
||||
|
||||
Throwing an exception should count as an initialization for this
|
||||
purpose.
|
||||
---
|
||||
NEWS | 2 ++
|
||||
Zend/tests/bug79657.phpt | 42 ++++++++++++++++++++++++++++++++++++++++
|
||||
Zend/zend_generators.c | 1 +
|
||||
3 files changed, 45 insertions(+)
|
||||
create mode 100644 Zend/tests/bug79657.phpt
|
||||
|
||||
diff --git a/Zend/tests/bug79657.phpt b/Zend/tests/bug79657.phpt
|
||||
new file mode 100644
|
||||
index 000000000000..fb2ccab3e3ef
|
||||
--- /dev/null
|
||||
+++ b/Zend/tests/bug79657.phpt
|
||||
@@ -0,0 +1,42 @@
|
||||
+--TEST--
|
||||
+Bug #79657: "yield from" hangs when invalid value encountered
|
||||
+--FILE--
|
||||
+<?php
|
||||
+
|
||||
+function throwException(): iterable
|
||||
+{
|
||||
+ throw new Exception();
|
||||
+}
|
||||
+
|
||||
+function loop(): iterable
|
||||
+{
|
||||
+ $callbacks = [
|
||||
+ function () {
|
||||
+ yield 'first';
|
||||
+ },
|
||||
+ function () {
|
||||
+ yield from throwException();
|
||||
+ }
|
||||
+ ];
|
||||
+
|
||||
+ foreach ($callbacks as $callback) {
|
||||
+ yield from $callback();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+function get(string $first, int $second): array
|
||||
+{
|
||||
+ return [];
|
||||
+}
|
||||
+
|
||||
+get(...loop());
|
||||
+
|
||||
+?>
|
||||
+--EXPECTF--
|
||||
+Fatal error: Uncaught Exception in %s:%d
|
||||
+Stack trace:
|
||||
+#0 %s(%d): throwException()
|
||||
+#1 %s(%d): {closure}()
|
||||
+#2 %s(%d): loop()
|
||||
+#3 {main}
|
||||
+ thrown in %s on line %d
|
||||
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
|
||||
index 4cd9087303a3..15bbfca1c58a 100644
|
||||
--- a/Zend/zend_generators.c
|
||||
+++ b/Zend/zend_generators.c
|
||||
@@ -857,6 +857,7 @@ ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
|
||||
} else {
|
||||
generator = zend_generator_get_current(orig_generator);
|
||||
zend_generator_throw_exception(generator, NULL);
|
||||
+ orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
|
||||
goto try_again;
|
||||
}
|
||||
}
|
||||
@ -54,13 +54,13 @@
|
||||
%global with_tidy 0
|
||||
%endif
|
||||
|
||||
%global upver 7.4.6
|
||||
%global upver 7.4.19
|
||||
#global rcver RC1
|
||||
|
||||
Summary: PHP scripting language for creating dynamic web sites
|
||||
Name: php
|
||||
Version: %{upver}%{?rcver:~%{rcver}}
|
||||
Release: 4%{?dist}
|
||||
Release: 1%{?dist}
|
||||
# All files licensed under PHP version 3.01, except
|
||||
# Zend is licensed under Zend
|
||||
# TSRM is licensed under BSD
|
||||
@ -102,14 +102,10 @@ Patch42: php-7.3.3-systzdata-v18.patch
|
||||
Patch43: php-7.4.0-phpize.patch
|
||||
# Use -lldap_r for OpenLDAP
|
||||
Patch45: php-7.4.0-ldap_r.patch
|
||||
# Make php_config.h constant across builds
|
||||
Patch46: php-7.2.4-fixheader.patch
|
||||
# drop "Configure command" from phpinfo output
|
||||
Patch47: php-5.6.3-phpinfo.patch
|
||||
|
||||
# Upstream fixes (100+)
|
||||
Patch100: php-bug79600.patch
|
||||
Patch101: php-bug79657.patch
|
||||
|
||||
# Security fixes (200+)
|
||||
|
||||
@ -717,12 +713,9 @@ in pure PHP.
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||
%patch45 -p1 -b .ldap_r
|
||||
%endif
|
||||
%patch46 -p1 -b .fixheader
|
||||
%patch47 -p1 -b .phpinfo
|
||||
|
||||
# upstream patches
|
||||
%patch100 -p1 -b .bug79600
|
||||
%patch101 -p1 -b .bug79657
|
||||
|
||||
# security patches
|
||||
|
||||
@ -814,6 +807,7 @@ cp %{SOURCE50} %{SOURCE51} %{SOURCE53} .
|
||||
%build
|
||||
# Set build date from https://reproducible-builds.org/specs/source-date-epoch/
|
||||
export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
|
||||
export PHP_UNAME=$(uname)
|
||||
|
||||
# Force use of system libtool:
|
||||
libtoolize --force --copy
|
||||
@ -1515,6 +1509,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 20 2021 Remi Collet <rcollet@redhat.com> - 7.4.19-1
|
||||
- rebase to 7.4.19 #1944110
|
||||
|
||||
* Mon Jun 15 2020 Remi Collet <rcollet@redhat.com> - 7.4.6-4
|
||||
- fix regression in 7.4.6 with generators and exception
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user