From: Christoph M. Becker Date: Wed, 24 Jun 2020 09:44:47 +0000 (+0200) Subject: Merge branch 'PHP-7.4' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a28589c7def80ecc7bb3417a8853df6b7860b46;p=php Merge branch 'PHP-7.4' * PHP-7.4: Fix potential environment variable deadlock --- 2a28589c7def80ecc7bb3417a8853df6b7860b46 diff --cc ext/standard/basic_functions.c index 3c2c18db96,64f27ef5af..a02a26b1a6 mode 100755,100644..100755 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c