]> granicus.if.org Git - php/log
php
4 years agoImprove X509_PKEY management in OpenSSL
Nikita Popov [Thu, 6 Aug 2020 11:18:29 +0000 (13:18 +0200)]
Improve X509_PKEY management in OpenSSL

Remove the free_pkey argument from php_openssl_pkey_from_zval,
instead return an EVP_PKEY that always needs to be freed
(by incrementing refcount if necessary).

This makes the code simpler and fixes a number of bugs in the
existing handling.

Closes GH-5946.

4 years agoExpand upgrading note for namespaced name change
Nikita Popov [Mon, 10 Aug 2020 09:19:35 +0000 (11:19 +0200)]
Expand upgrading note for namespaced name change

Mention the case from bug #79942.

[ci skip]

4 years agoFixed bug #79948
Nikita Popov [Mon, 10 Aug 2020 08:28:13 +0000 (10:28 +0200)]
Fixed bug #79948

Make sure we don't execute further scripts if one of them encountered
an exit exception.

Also make sure that we free file handles that end up unused due to
an early abort in php_execute_scripts(), which turned up as an
issue in the added test case.

Finally, make use of EG(exit_status) in the places where we
zend_eval_string_ex, instead of unconditionally assigning exit
code 254. If an error occurs, the error handler will already set
exit status 255.

4 years agoFixup phar test
Nikita Popov [Mon, 10 Aug 2020 08:47:18 +0000 (10:47 +0200)]
Fixup phar test

4 years agoFixed bug #77561
Nikita Popov [Mon, 10 Aug 2020 08:38:33 +0000 (10:38 +0200)]
Fixed bug #77561

Unconditionally strip shebang lines when using the CLI SAPI,
independently of whether they occur in the primary or non-primary
script. It's unlikely that someone intentionally wants to print
that shebang line when including a script, and this regularly
causes issues when scripts are used in multiple contexts, e.g.
for direct invocation and as a phar bootstrap.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 10 Aug 2020 08:12:49 +0000 (10:12 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79947

4 years agoFixed bug #79947
Nikita Popov [Mon, 10 Aug 2020 08:08:31 +0000 (10:08 +0200)]
Fixed bug #79947

Move the FREE_OP for op_data out of the zend_binary_assign_op_dim_slow()
slow path, so it can be used by the other error path as well. This
makes ASSIGN_DIM_OP structurally more similar to ASSIGN_DIM.

4 years agoFixed bug #79946
Nikita Popov [Mon, 10 Aug 2020 07:50:55 +0000 (09:50 +0200)]
Fixed bug #79946

Declare __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS via -D
to make sure they are declared before the first stdint.h include.
We also define these in php_stdint.h, but don't always include that
file first.

This is necessary for old compilers that use C99 rather than C11
semantics for stdint.h.

4 years agoproc_open/openpty: DragonFlyBSD build fix.
David Carlier [Sat, 8 Aug 2020 16:30:15 +0000 (17:30 +0100)]
proc_open/openpty: DragonFlyBSD build fix.

Similarly to NetBSD emalloc-ish api had been introduced into libutil.

Closes GH-5960.

4 years agoRevert "Make diff section contents red(-)/green(+) in run-tests.php"
Nikita Popov [Mon, 10 Aug 2020 07:38:48 +0000 (09:38 +0200)]
Revert "Make diff section contents red(-)/green(+) in run-tests.php"

This reverts commit 58489bd3b93e10c150933eefac05297b48213eb3.

This also uses ANSI escape code coloring for .diff files, where it
is not meaningful.

4 years agoMake diff section contents red(-)/green(+) in run-tests.php
Tyson Andre [Sun, 9 Aug 2020 15:58:08 +0000 (11:58 -0400)]
Make diff section contents red(-)/green(+) in run-tests.php

This uses green for lines with `+` and red for lines with `-`.

Colors(Red and Green) would make the failure causes stand out visually when scrolling through errors.

Closes GH-5965

4 years agoUse short array values in run-tests.php
Tyson Andre [Sun, 9 Aug 2020 19:45:04 +0000 (15:45 -0400)]
Use short array values in run-tests.php

The run-tests.php file already requires php 7 syntax.
Done automatically with phpcbf with no other changes done/planned.

This file is already using short arrays in other places.

run-tests has already been substantially refactored in PHP 8.0
compared to PHP 7.4.

This makes merge conflicts more likely, but changes to run-tests.php on older
versions are less frequent bug fixes.

4 years agoAdd many missing closing PHP tags to tests
Máté Kocsis [Sun, 9 Aug 2020 09:06:57 +0000 (11:06 +0200)]
Add many missing closing PHP tags to tests

Closes GH-5958

4 years agoFix m4 quotation
Nikita Popov [Sat, 8 Aug 2020 08:38:31 +0000 (10:38 +0200)]
Fix m4 quotation

We should not try to expand AX_CHECK_COMPILE_FLAG inside the
error message...

4 years agoPromote various warnings to Error in GMP extension
George Peter Banyard [Fri, 7 Aug 2020 16:15:25 +0000 (18:15 +0200)]
Promote various warnings to Error in GMP extension

This gets rid of most false returns

Closes GH-5882

4 years agoAdd colours to test results in run-tests.php
George Peter Banyard [Fri, 31 Jul 2020 18:02:59 +0000 (19:02 +0100)]
Add colours to test results in run-tests.php

The test runner will attempt to colourise the result of each test

The --no-color option is introduced to disable this feature.

Closes GH-5901

4 years agoDrop '#if 0' in mysqlnd_debug() from the MySQLnd extension
George Peter Banyard [Thu, 6 Aug 2020 15:27:13 +0000 (17:27 +0200)]
Drop '#if 0' in mysqlnd_debug() from the MySQLnd extension

Closes GH-5587

4 years agoRemove some duplicate iconv path logic
Nikita Popov [Fri, 7 Aug 2020 15:20:02 +0000 (17:20 +0200)]
Remove some duplicate iconv path logic

PHP_SETUP_ICONV already adds the include path to INCLUDES and the
library path to SHARED_LIBADD.

4 years agoRemove PHP_ICONV_H_PATH
Nikita Popov [Fri, 7 Aug 2020 14:11:27 +0000 (16:11 +0200)]
Remove PHP_ICONV_H_PATH

Directly include <iconv.h> instead, now that the giconv.h
distinction no longer exists.

4 years agoRemove giconv support
Nikita Popov [Fri, 7 Aug 2020 14:05:24 +0000 (16:05 +0200)]
Remove giconv support

The best information I was able to find about this is this mail
from 2009 which indicates that giconv is an old FreeBSD iconv
implementation that has long since been superseded by libiconv.

https://lists.samba.org/archive/samba-technical/2009-June/065177.html

4 years agoRemove more leftovers of PHP_DEFINE handling
Nikita Popov [Fri, 7 Aug 2020 13:54:01 +0000 (15:54 +0200)]
Remove more leftovers of PHP_DEFINE handling

4 years agoopcache gdb: Set the EI_OSABI value for NetBSD.
David Carlier [Thu, 6 Aug 2020 15:10:24 +0000 (16:10 +0100)]
opcache gdb: Set the EI_OSABI value for NetBSD.

Closes GH-5948.

4 years agoAdd another round of missing parameter types to stubs
Máté Kocsis [Fri, 7 Aug 2020 14:48:39 +0000 (16:48 +0200)]
Add another round of missing parameter types to stubs

Closes GH-5950

4 years agoFix ZPP order in ext/phar
Máté Kocsis [Fri, 7 Aug 2020 14:47:50 +0000 (16:47 +0200)]
Fix ZPP order in ext/phar

4 years agoAdd UPGRADING.INTERNALS notes for zend_object* changes
Nikita Popov [Fri, 7 Aug 2020 14:39:46 +0000 (16:39 +0200)]
Add UPGRADING.INTERNALS notes for zend_object* changes

Closes GH-5953.

4 years agoAccept zend_object* in zend_update_property
Nikita Popov [Fri, 7 Aug 2020 13:27:57 +0000 (15:27 +0200)]
Accept zend_object* in zend_update_property

4 years agoAccept zend_object* in zend_unset_property
Nikita Popov [Fri, 7 Aug 2020 13:17:59 +0000 (15:17 +0200)]
Accept zend_object* in zend_unset_property

4 years agoAccept zend_object* in zend_get_exception_base
Nikita Popov [Fri, 7 Aug 2020 13:15:50 +0000 (15:15 +0200)]
Accept zend_object* in zend_get_exception_base

4 years agoAccept zend_object in zend_read_property
Nikita Popov [Fri, 7 Aug 2020 13:05:24 +0000 (15:05 +0200)]
Accept zend_object in zend_read_property

4 years agoMerge branch 'PHP-7.4' into master
Christoph M. Becker [Fri, 7 Aug 2020 13:06:40 +0000 (15:06 +0200)]
Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Prevent tempnam tests conflicts

4 years agoPrevent tempnam tests conflicts
Christoph M. Becker [Fri, 7 Aug 2020 12:56:54 +0000 (14:56 +0200)]
Prevent tempnam tests conflicts

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 7 Aug 2020 12:37:50 +0000 (14:37 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix bug #70574: Move files to proper locale dir

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 7 Aug 2020 12:37:36 +0000 (14:37 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #70574: Move files to proper locale dir

4 years agoFix bug #70574: Move files to proper locale dir
Florian Engelhardt [Wed, 5 Aug 2020 11:33:52 +0000 (13:33 +0200)]
Fix bug #70574: Move files to proper locale dir

Closes GH-5940.

4 years agoDon't use PHP_DEFINE in iconv
Nikita Popov [Fri, 7 Aug 2020 10:40:47 +0000 (12:40 +0200)]
Don't use PHP_DEFINE in iconv

iconv is the only consumer of this custom define mechanism that
puts every define into a single file. Use the standard mechanism
instead.

4 years agoAdd more argument types to stubs
Máté Kocsis [Wed, 5 Aug 2020 16:45:07 +0000 (18:45 +0200)]
Add more argument types to stubs

Closes GH-5943

4 years agoReapply "Explicitly validate popen mode"
Nikita Popov [Wed, 5 Aug 2020 09:27:13 +0000 (11:27 +0200)]
Reapply "Explicitly validate popen mode"

To avoid behavior differences due to libc. This time with the
check only for the non-win32 case, as Windows support additional
modifiers here (t/b).

4 years agoRevert "Explicitly validate popen mode"
Nikita Popov [Thu, 6 Aug 2020 19:53:13 +0000 (21:53 +0200)]
Revert "Explicitly validate popen mode"

This reverts commit ab36540bddb63139c3da9a9da5e5feacdf7bf7bf.

Causes a test failure on Windows.

4 years agoAdd type information to test-runner
George Peter Banyard [Thu, 6 Aug 2020 18:37:36 +0000 (20:37 +0200)]
Add type information to test-runner

Closes GH-5942

4 years agoPromote warnings to Error in FileInfo extension
George Peter Banyard [Thu, 6 Aug 2020 11:37:36 +0000 (13:37 +0200)]
Promote warnings to Error in FileInfo extension

Closes GH-5914

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 6 Aug 2020 10:35:37 +0000 (12:35 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix file clash in zlib test

4 years agoFix file clash in zlib test
Nikita Popov [Thu, 6 Aug 2020 10:34:14 +0000 (12:34 +0200)]
Fix file clash in zlib test

4 years agoMention security in step 3, as otherwise it might be overlooked
Derick Rethans [Thu, 6 Aug 2020 10:14:39 +0000 (11:14 +0100)]
Mention security in step 3, as otherwise it might be overlooked

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 6 Aug 2020 10:04:23 +0000 (12:04 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79934: CRLF-only line in heredoc causes parsing error

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 6 Aug 2020 10:03:57 +0000 (12:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #79934: CRLF-only line in heredoc causes parsing error

4 years agoFix #79934: CRLF-only line in heredoc causes parsing error
Pieter van den Ham [Wed, 5 Aug 2020 18:21:26 +0000 (20:21 +0200)]
Fix #79934: CRLF-only line in heredoc causes parsing error

Fixes the function `next_newline()` in zend_language_scanner.l. The
function now correctly returns a newline_len of 2 for "\r\n".

Closes GH-5944.

4 years agoAvoid getThis() usages in zip extension
Nikita Popov [Thu, 6 Aug 2020 09:28:35 +0000 (11:28 +0200)]
Avoid getThis() usages in zip extension

There isn't any magic going on here, we can just use ZEND_THIS
and assume it exists.

4 years agoExplicitly validate popen mode
Nikita Popov [Wed, 5 Aug 2020 09:27:13 +0000 (11:27 +0200)]
Explicitly validate popen mode

To avoid behavior differences due to libc.

4 years agoAdd GLOB_BRACE skipif
Nikita Popov [Wed, 5 Aug 2020 18:09:15 +0000 (20:09 +0200)]
Add GLOB_BRACE skipif

4 years agoTemporarily disable s390x job
Nikita Popov [Wed, 5 Aug 2020 17:58:44 +0000 (19:58 +0200)]
Temporarily disable s390x job

These aren't getting scheduled and just keep hogging jobs so
nothing else gets scheduled either.

4 years agoPrefer strtoll over atoll
Nikita Popov [Wed, 5 Aug 2020 16:36:27 +0000 (18:36 +0200)]
Prefer strtoll over atoll

Both are specified by C99, but strtoll has specified overflow
behavior while atoll does not, so prefer using it.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 5 Aug 2020 16:18:51 +0000 (18:18 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Check ps -p availability in process title test
  Add privilege check in pcntl_unshare test

4 years agoCheck ps -p availability in process title test
Nikita Popov [Wed, 5 Aug 2020 10:23:27 +0000 (12:23 +0200)]
Check ps -p availability in process title test

4 years agoAdd privilege check in pcntl_unshare test
Nikita Popov [Wed, 5 Aug 2020 07:53:22 +0000 (09:53 +0200)]
Add privilege check in pcntl_unshare test

Privileges for CLONE_NEWPID were not checked.

4 years agoOnly force log startup errors if display_startup_errors disabled
Nikita Popov [Wed, 5 Aug 2020 10:57:47 +0000 (12:57 +0200)]
Only force log startup errors if display_startup_errors disabled

Otherwise this results in duplicate errors.

Closes GH-5941.

4 years agoNormalize error message capitalization
Nikita Popov [Wed, 5 Aug 2020 14:44:06 +0000 (16:44 +0200)]
Normalize error message capitalization

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 5 Aug 2020 14:42:40 +0000 (16:42 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix memory leak on socket_sendmsg() / socket_recvmsg() error

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 5 Aug 2020 14:42:13 +0000 (16:42 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix memory leak on socket_sendmsg() / socket_recvmsg() error

4 years agoFix memory leak on socket_sendmsg() / socket_recvmsg() error
Nikita Popov [Wed, 5 Aug 2020 08:55:41 +0000 (10:55 +0200)]
Fix memory leak on socket_sendmsg() / socket_recvmsg() error

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 5 Aug 2020 13:44:04 +0000 (15:44 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79930
  Fix iov_base pointer type for illumos
  Backport bless_tests.php changes from PHP 8

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 5 Aug 2020 13:43:49 +0000 (15:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #79930

4 years agoFixed bug #79930
Nikita Popov [Wed, 5 Aug 2020 13:41:42 +0000 (15:41 +0200)]
Fixed bug #79930

We're inserting src_zval, so that's what we should addref.

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 5 Aug 2020 13:18:03 +0000 (15:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix iov_base pointer type for illumos

4 years agoFix iov_base pointer type for illumos
David Carlier [Wed, 5 Aug 2020 09:09:18 +0000 (10:09 +0100)]
Fix iov_base pointer type for illumos

These systems has two versions of the iovec interface dependent on
compiler flags passed, the legacy version causing little build issue.

Closes GH-5939.

4 years agoBackport bless_tests.php changes from PHP 8
Nikita Popov [Wed, 5 Aug 2020 12:59:56 +0000 (14:59 +0200)]
Backport bless_tests.php changes from PHP 8

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 5 Aug 2020 12:59:06 +0000 (14:59 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Unset ai_canonname field in dump

4 years agoUnset ai_canonname field in dump
Nikita Popov [Wed, 5 Aug 2020 12:56:15 +0000 (14:56 +0200)]
Unset ai_canonname field in dump

Okay, looks like ai_canonname does not get set on macos even if
AI_CANONNAME is specified, so canonicalize this in the other
direction instead and unset ai_canonname if it is present.

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 5 Aug 2020 10:12:24 +0000 (12:12 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Check ps -p availability in proc_nice test
  Set AI_CANONNAME flag in socket_addrinfo test
  Add ipv6 skipif to test
  Improve privilege check in pcntl_setpriority() test

4 years agoCheck ps -p availability in proc_nice test
Nikita Popov [Wed, 5 Aug 2020 09:15:49 +0000 (11:15 +0200)]
Check ps -p availability in proc_nice test

4 years agoSet AI_CANONNAME flag in socket_addrinfo test
Nikita Popov [Wed, 5 Aug 2020 09:11:17 +0000 (11:11 +0200)]
Set AI_CANONNAME flag in socket_addrinfo test

Musl always populates ai_canonname. Set the flag to avoid output
discrepancies.

4 years agoAdd ipv6 skipif to test
Nikita Popov [Wed, 5 Aug 2020 09:02:21 +0000 (11:02 +0200)]
Add ipv6 skipif to test

This was done for the -unix variant, but not the (formerly
windows-only?) main test.

4 years agoImprove privilege check in pcntl_setpriority() test
Nikita Popov [Wed, 5 Aug 2020 07:58:34 +0000 (09:58 +0200)]
Improve privilege check in pcntl_setpriority() test

We need CAP_SYS_NICE privileges, which might not be available
just because we're running as root (Docker...)

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 5 Aug 2020 08:42:08 +0000 (10:42 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Suppress warning in pcntl_unshare skipif
  Use standard types in fopencookie test
  Remove posix_kill() test
  Relax error message check
  Check whether setlocale -a is available

4 years agoSuppress warning in pcntl_unshare skipif
Nikita Popov [Tue, 4 Aug 2020 14:05:11 +0000 (16:05 +0200)]
Suppress warning in pcntl_unshare skipif

4 years agoUse standard types in fopencookie test
Nikita Popov [Tue, 4 Aug 2020 13:54:31 +0000 (15:54 +0200)]
Use standard types in fopencookie test

Instead of internal __size_t / __off64_t types use ssize_t and off64_t.
This makes it work on musl as well.

4 years agoRemove posix_kill() test
Nikita Popov [Tue, 4 Aug 2020 13:06:19 +0000 (15:06 +0200)]
Remove posix_kill() test

This test is doing something really dubious. There's a race
condition here that would kill some poor process that happens
to start at just the wrong time.

4 years agoRelax error message check
Nikita Popov [Tue, 4 Aug 2020 11:14:12 +0000 (13:14 +0200)]
Relax error message check

4 years agoCheck whether setlocale -a is available
Nikita Popov [Tue, 4 Aug 2020 11:02:52 +0000 (13:02 +0200)]
Check whether setlocale -a is available

4 years agoSuppress warning in pcntl_unshare skipif
Nikita Popov [Tue, 4 Aug 2020 14:05:11 +0000 (16:05 +0200)]
Suppress warning in pcntl_unshare skipif

4 years agoUse standard types in fopencookie test
Nikita Popov [Tue, 4 Aug 2020 13:54:31 +0000 (15:54 +0200)]
Use standard types in fopencookie test

Instead of internal __size_t / __off64_t types use ssize_t and off64_t.
This makes it work on musl as well.

4 years agoRemove posix_kill() test
Nikita Popov [Tue, 4 Aug 2020 13:06:19 +0000 (15:06 +0200)]
Remove posix_kill() test

This test is doing something really dubious. There's a race
condition here that would kill some poor process that happens
to start at just the wrong time.

4 years agoRelax error message check
Nikita Popov [Tue, 4 Aug 2020 11:14:12 +0000 (13:14 +0200)]
Relax error message check

4 years agoCheck whether setlocale -a is available
Nikita Popov [Tue, 4 Aug 2020 11:02:52 +0000 (13:02 +0200)]
Check whether setlocale -a is available

4 years agoUpdate NEWS for 8.0.0beta2
Gabriel Caruso [Tue, 4 Aug 2020 17:40:26 +0000 (17:40 +0000)]
Update NEWS for 8.0.0beta2

4 years agoUpdate API version numbers
Gabriel Caruso [Tue, 4 Aug 2020 07:58:33 +0000 (09:58 +0200)]
Update API version numbers

In preparation for PHP 8.0.

4 years agoRevert "Prepare for PHP 8.1"
Nikita Popov [Tue, 4 Aug 2020 20:24:26 +0000 (22:24 +0200)]
Revert "Prepare for PHP 8.1"

This reverts commit 1ab4d0e6b7abb67d5a01ce3327bf973772271fb2.
This reverts commit a359635cb1a4df8b5137a506c88c4cb102acac0e.

4 years agoFPM: Prevent warning with raising pm.max_children for shared pool
Jakub Zelenka [Tue, 4 Aug 2020 20:01:13 +0000 (21:01 +0100)]
FPM: Prevent warning with raising pm.max_children for shared pool

4 years agoPrepare for PHP 8.1
Gabriel Caruso [Tue, 4 Aug 2020 16:46:14 +0000 (18:46 +0200)]
Prepare for PHP 8.1

4 years agoUpdate API version numbers
Gabriel Caruso [Tue, 4 Aug 2020 07:58:33 +0000 (09:58 +0200)]
Update API version numbers

In preparation for PHP 8.0.

4 years agoRelax precision in atan test
Nikita Popov [Tue, 4 Aug 2020 11:17:51 +0000 (13:17 +0200)]
Relax precision in atan test

4 years agoRelax precision in hypot test
Nikita Popov [Tue, 4 Aug 2020 11:17:08 +0000 (13:17 +0200)]
Relax precision in hypot test

4 years agoAdd compatibility define for PHP_CHECK_GCC_ARG
Nikita Popov [Tue, 4 Aug 2020 14:11:58 +0000 (16:11 +0200)]
Add compatibility define for PHP_CHECK_GCC_ARG

This defines the m4 macro, but makes it always error.

4 years agoMerge branch 'PHP-7.4' into master
Christoph M. Becker [Tue, 4 Aug 2020 10:34:54 +0000 (12:34 +0200)]
Merge branch 'PHP-7.4' into master

* PHP-7.4:
  [ci skip] Fix 7.3.21 release date

4 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 4 Aug 2020 10:32:32 +0000 (12:32 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  [ci skip] Fix 7.3.21 release date

4 years ago[ci skip] Fix 7.3.21 release date
Christoph M. Becker [Tue, 4 Aug 2020 10:31:08 +0000 (12:31 +0200)]
[ci skip] Fix 7.3.21 release date

4 years agoFix opcache JIT on NetBSD with PaX
David Carlier [Mon, 3 Aug 2020 19:49:58 +0000 (20:49 +0100)]
Fix opcache JIT on NetBSD with PaX

When PaX mprotect active, opcache JIT test fail as it needs
the PROT_MPROTECT macro to be able to allow further permission
promotion with mprotect.

Closes GH-5929.

4 years agoXFAIL status-listen FPM test
Nikita Popov [Tue, 4 Aug 2020 08:27:33 +0000 (10:27 +0200)]
XFAIL status-listen FPM test

Has frequent intermittent failures with:

ERROR: The NOTICE does not match expected message:
- PATTERN: /^\[\d\d-\w\w\w-\d{4} \d\d:\d\d:\d\d\] NOTICE: Terminating ...$/
- MESSAGE: [04-Aug-2020 08:15:37] WARNING: [pool unconfined_status] server reached max_children setting (2), consider raising it
- EXPECT: 'Terminating ...'
- ACTUAL: '2020 08:15:37] WARNING: [pool unconfined_status] server reached max_children setting (2), consider raising it'

4 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 4 Aug 2020 08:26:27 +0000 (10:26 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Manually build re2c on macos

4 years agoManually build re2c on macos
Nikita Popov [Tue, 4 Aug 2020 08:05:23 +0000 (10:05 +0200)]
Manually build re2c on macos

Avoid issues with the licensing mafia, see:
https://github.com/Homebrew/homebrew-core/pull/59094

Closes GH-5932.

4 years agoAdd opcache.jit=tracing|function values, make on/yes/true synonym for tracing.
Benjamin Eberlei [Fri, 31 Jul 2020 11:27:32 +0000 (13:27 +0200)]
Add opcache.jit=tracing|function values, make on/yes/true synonym for tracing.