php-master/.git
21 hours agoMerge branch 'PHP-8.0' master origin/HEAD origin/master
Christoph M. Becker [Wed, 2 Dec 2020 15:53:43 +0000 (16:53 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix failing VirtualProtect() calls

22 hours agoFix failing VirtualProtect() calls
Christoph M. Becker [Wed, 2 Dec 2020 14:06:30 +0000 (15:06 +0100)]
Fix failing VirtualProtect() calls

Whenever JIT is disabled due to incompatibilities, we also need to set
`JIT_G(on)` to zero.

Closes GH-6470.

27 hours agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 2 Dec 2020 10:29:56 +0000 (11:29 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #80457

27 hours agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Wed, 2 Dec 2020 10:29:41 +0000 (11:29 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #80457

27 hours agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 2 Dec 2020 10:29:06 +0000 (11:29 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #80457

27 hours agoFixed bug #80457
Nikita Popov [Wed, 2 Dec 2020 10:26:10 +0000 (11:26 +0100)]
Fixed bug #80457

On x32 sizeof(size_t) != sizeof(zend_long), so we need to be
careful with sign extension here.

Patch by bruno dot premont at restena dot lu.

27 hours agoDon't disable phpdbg on macos
Nikita Popov [Wed, 2 Dec 2020 09:08:34 +0000 (10:08 +0100)]
Don't disable phpdbg on macos

I'm not sure what the original issue here was, but it seems to
be working fine now, so let's make sure it stays that way...

27 hours agoEnsure consistent error message in phpdbg parser
Nikita Popov [Wed, 2 Dec 2020 09:40:57 +0000 (10:40 +0100)]
Ensure consistent error message in phpdbg parser

This would be either $end or "end of file" depending on bison
version. Explicitly specify "end of command" instead, which seems
more appropriate in context.

27 hours agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 2 Dec 2020 09:55:45 +0000 (10:55 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Don't throw from imagecreatefromstring() with too short string

28 hours agoDon't throw from imagecreatefromstring() with too short string
Nikita Popov [Wed, 2 Dec 2020 09:51:55 +0000 (10:51 +0100)]
Don't throw from imagecreatefromstring() with too short string

If the string is too short, we should treat this the same way as
an unrecognized image type. This function should be usable to
determine whether something is a valid image without doing any
checks beforehand.

28 hours agoMerge branch 'PHP-8.0'
Nikita Popov [Wed, 2 Dec 2020 09:19:42 +0000 (10:19 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #80462

28 hours agoFixed bug #80462
Nikita Popov [Wed, 2 Dec 2020 09:19:32 +0000 (10:19 +0100)]
Fixed bug #80462

43 hours agoFlesh out HashTable insertion APIs
Sara Golemon [Fri, 7 Aug 2020 14:31:52 +0000 (14:31 +0000)]
Flesh out HashTable insertion APIs

Fills out the array/object-property insert helpers for zend_array, zend_object, and zend_reference.

This adds the following matrix of 18 APIs
add_next_index_T()
add_index_T()
add_assoc_T()
add_assoc_T_ex()
add_property_T()
add_property_T_ex()

Where T in array, object, reference

Converted internal callsites currently doing an explicit object wrap.

45 hours agoMerge branch 'PHP-8.0'
George Peter Banyard [Tue, 1 Dec 2020 16:39:11 +0000 (16:39 +0000)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Backport IMAP test modernization to PHP-8.0 branch

45 hours agoBackport IMAP test modernization to PHP-8.0 branch
George Peter Banyard [Tue, 1 Dec 2020 15:18:54 +0000 (15:18 +0000)]
Backport IMAP test modernization to PHP-8.0 branch

Closes GH-6476

45 hours agoMerge branch 'PHP-8.0'
Christoph M. Becker [Tue, 1 Dec 2020 16:00:53 +0000 (17:00 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #73809: Phar Zip parse crash - mmap fail

45 hours agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Tue, 1 Dec 2020 15:59:47 +0000 (16:59 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #73809: Phar Zip parse crash - mmap fail

45 hours agoFix #73809: Phar Zip parse crash - mmap fail
Christoph M. Becker [Tue, 1 Dec 2020 13:20:39 +0000 (14:20 +0100)]
Fix #73809: Phar Zip parse crash - mmap fail

Phar signatures practically are of limited size; for the MD5 and SHA
hashes the size is fixed (at most 64 bytes for SHA512); for OpenSSL
public keys there is no size limit in theory, but "64 KiB ought to be
good enough for anybody".  So we check for that limit, to avoid fatal
errors due to out of memory conditions.

Since it is neither possible to have the signature compressed in the
ZIP archive, nor is it possible to manually add a signature via Phar,
we use ZipArchive to create a suitable archive for the test on the fly.

Closes GH-6474.

2 days agoMerge branch 'PHP-8.0'
Dmitry Stogov [Tue, 1 Dec 2020 13:47:11 +0000 (16:47 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #80447 (Strange out of memory error when running with JIT)

2 days agoFixed bug #80447 (Strange out of memory error when running with JIT)
Dmitry Stogov [Tue, 1 Dec 2020 13:46:41 +0000 (16:46 +0300)]
Fixed bug #80447 (Strange out of memory error when running with JIT)

2 days agoMerge branch 'PHP-8.0'
Dmitry Stogov [Tue, 1 Dec 2020 13:43:41 +0000 (16:43 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Bug #80447 (Strange out of memory error when running with JIT)

2 days agoBug #80447 (Strange out of memory error when running with JIT)
Dmitry Stogov [Tue, 1 Dec 2020 13:43:05 +0000 (16:43 +0300)]
Bug #80447 (Strange out of memory error when running with JIT)

2 days agoDon't try to open null file
Nikita Popov [Tue, 1 Dec 2020 12:02:29 +0000 (13:02 +0100)]
Don't try to open null file

If the loader is not found, directly return null, instead of
trying to open it.

2 days agoMerge branch 'PHP-8.0'
Dmitry Stogov [Tue, 1 Dec 2020 12:26:37 +0000 (15:26 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Disable stack reuse optimization for x86 PIC code. It may clobber local variable used for Global Offset Table.

2 days agoDisable stack reuse optimization for x86 PIC code. It may clobber local variable...
Dmitry Stogov [Tue, 1 Dec 2020 12:20:06 +0000 (15:20 +0300)]
Disable stack reuse optimization for x86 PIC code. It may clobber local variable used for Global Offset Table.

2 days agoDetermine run-tests executables consistently
Nikita Popov [Tue, 1 Dec 2020 11:35:05 +0000 (12:35 +0100)]
Determine run-tests executables consistently

2 days agoDon't pass null to strlen()
Nikita Popov [Mon, 30 Nov 2020 16:01:09 +0000 (17:01 +0100)]
Don't pass null to strlen()

2 days agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 1 Dec 2020 10:50:22 +0000 (11:50 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Don't use scope when validating Attribute

2 days agoDon't use scope when validating Attribute
Nikita Popov [Tue, 1 Dec 2020 10:49:27 +0000 (11:49 +0100)]
Don't use scope when validating Attribute

This is not safe to do at this point. Even if we made it safe,
we'd see inconsistencies due to a partially compiled class.

Fixes oss-fuzz #28129.

2 days agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 1 Dec 2020 10:32:28 +0000 (11:32 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix use after free with file cache and arena allocated strings

2 days agoFix use after free with file cache and arena allocated strings
Nikita Popov [Tue, 1 Dec 2020 10:31:23 +0000 (11:31 +0100)]
Fix use after free with file cache and arena allocated strings

2 days agoAdd const modifier for zend_extension members
codinghuang [Fri, 27 Nov 2020 12:29:59 +0000 (20:29 +0800)]
Add const modifier for zend_extension members

Closes GH-6462.

2 days agoMerge branch 'PHP-8.0'
Nikita Popov [Tue, 1 Dec 2020 09:24:02 +0000 (10:24 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Don't mark cpu_supports functions as always inline

2 days agoDon't mark cpu_supports functions as always inline
Nikita Popov [Tue, 1 Dec 2020 09:22:36 +0000 (10:22 +0100)]
Don't mark cpu_supports functions as always inline

The use of no-sanitize may result in an inlining failure, which
will be promoted into a compile error by always-inline. Use a
normal inlining hint without enforcing it.

2 days agoMerge branch 'PHP-8.0'
Dmitry Stogov [Tue, 1 Dec 2020 08:34:36 +0000 (11:34 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed incorrect "skipif.inc" include

2 days agoFixed incorrect "skipif.inc" include
Dmitry Stogov [Tue, 1 Dec 2020 08:34:09 +0000 (11:34 +0300)]
Fixed incorrect "skipif.inc" include

2 days agoMerge branch 'PHP-8.0'
Dmitry Stogov [Tue, 1 Dec 2020 06:59:25 +0000 (09:59 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Skip test if JIT is not available

2 days agoSkip test if JIT is not available
Dmitry Stogov [Tue, 1 Dec 2020 06:58:33 +0000 (09:58 +0300)]
Skip test if JIT is not available

2 days agohash: Add build dir for ext/hash/murmur
Anatol Belski [Mon, 30 Nov 2020 19:48:05 +0000 (20:48 +0100)]
hash: Add build dir for ext/hash/murmur

Signed-off-by: Anatol Belski <ab@php.net>
2 days agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 30 Nov 2020 15:04:04 +0000 (16:04 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #62004: SplFileObject: fgets after seek returns wrong line

2 days agoFix #62004: SplFileObject: fgets after seek returns wrong line
Christoph M. Becker [Wed, 18 Nov 2020 12:41:21 +0000 (13:41 +0100)]
Fix #62004: SplFileObject: fgets after seek returns wrong line

As it is, `::seek(0)` sets the file pointer to the beginning of the
file, but `::seek($n)` where `$n > 0` sets the file pointer to the
beginning of the following line, having line `$n` already read into the
line buffer.  This is pretty inconsistent; we fix it by always seeking
to the beginning of the line.

We also add a test case for the duplicate bug #46569.

Closes GH-6434.

2 days agoMerge branch 'PHP-8.0'
Dmitry Stogov [Mon, 30 Nov 2020 14:56:32 +0000 (17:56 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Preallocate stack space for JIT in execute_ex() to eliminate JIT prologue/epilogue.

2 days agoPreallocate stack space for JIT in execute_ex() to eliminate JIT prologue/epilogue.
Dmitry Stogov [Mon, 30 Nov 2020 14:56:08 +0000 (17:56 +0300)]
Preallocate stack space for JIT in execute_ex() to eliminate JIT prologue/epilogue.

2 days agoMerge branch 'PHP-8.0'
Dmitry Stogov [Mon, 30 Nov 2020 14:47:02 +0000 (17:47 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed "may be used uninitialized" compilation warnings

2 days agoFixed "may be used uninitialized" compilation warnings
Dmitry Stogov [Mon, 30 Nov 2020 14:46:43 +0000 (17:46 +0300)]
Fixed "may be used uninitialized" compilation warnings

2 days agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 30 Nov 2020 14:24:44 +0000 (15:24 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Drop all JIT related XFAILS from phpdbg test suite

2 days agoDrop all JIT related XFAILS from phpdbg test suite
Christoph M. Becker [Mon, 30 Nov 2020 14:19:28 +0000 (15:19 +0100)]
Drop all JIT related XFAILS from phpdbg test suite

phpdbg now disables JIT, so these cause XFAIL warnings.

2 days agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 30 Nov 2020 14:17:35 +0000 (15:17 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Next attempt to fix bug #80368

2 days agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Mon, 30 Nov 2020 14:17:27 +0000 (15:17 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Next attempt to fix bug #80368

2 days agoNext attempt to fix bug #80368
Nikita Popov [Mon, 30 Nov 2020 14:15:59 +0000 (15:15 +0100)]
Next attempt to fix bug #80368

Apparently treating LibreSSL as OpenSSL 1.1 is not just something
we did in our code, it's something that upstream LibreSSL claims,
despite not actually being compatible. Duh.

Check for EVP_CIPH_OCB_MODE instead, which should reliably
determine support...

2 days agoMerge branch 'PHP-8.0'
George Peter Banyard [Mon, 30 Nov 2020 14:08:49 +0000 (14:08 +0000)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix Bug #80438: imap_msgno() incorrectly warns and return false on valid UIDs in PHP 8.0.0
  Rename XmlParser to XMLParser for consistency with XMLWriter/XMLReader

2 days agoFix Bug #80438: imap_msgno() incorrectly warns and return false on valid UIDs in...
George Peter Banyard [Mon, 30 Nov 2020 04:48:17 +0000 (04:48 +0000)]
Fix Bug #80438: imap_msgno() incorrectly warns and return false on valid UIDs in PHP 8.0.0

Checking for a valid Unique ID (UID) cannot use the convenience macro as they might
be larger than the message number which has for maximum value the total number of
current messages available in the mailbox.

2 days agoRename XmlParser to XMLParser for consistency with XMLWriter/XMLReader
George Peter Banyard [Tue, 24 Nov 2020 13:51:51 +0000 (13:51 +0000)]
Rename XmlParser to XMLParser for consistency with XMLWriter/XMLReader

2 days agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 30 Nov 2020 14:06:40 +0000 (15:06 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Suppress stream errors in mysqlnd

2 days agoSuppress stream errors in mysqlnd
Nikita Popov [Thu, 26 Nov 2020 11:30:17 +0000 (12:30 +0100)]
Suppress stream errors in mysqlnd

mysqlnd currently sets error_reporting=0 to suppress errors while
writing to streams. Unfortunately these errors are still visible
to userland error handlers, which is a source of confusion.
See for example https://bugs.php.net/bug.php?id=80412.

Instead add a stream flag that suppresses the emission of
read/write errors in the first place, and set it in mysqlnd.

I think it might be useful to have this option for userland as
well in the future, but for now this is just an internal
mechanism.

Closes GH-6458.

3 days agoMerge branch 'PHP-8.0'
Dmitry Stogov [Mon, 30 Nov 2020 13:43:04 +0000 (16:43 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Hide phpdbg/JIT incompatibility macro (JIT is disabled for phpdbg)

3 days agoHide phpdbg/JIT incompatibility macro (JIT is disabled for phpdbg)
Dmitry Stogov [Mon, 30 Nov 2020 13:42:17 +0000 (16:42 +0300)]
Hide phpdbg/JIT incompatibility macro (JIT is disabled for phpdbg)

3 days agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 30 Nov 2020 13:33:06 +0000 (14:33 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Add additional entries to unserialize corpus

3 days agoAdd additional entries to unserialize corpus
Nikita Popov [Mon, 30 Nov 2020 13:32:07 +0000 (14:32 +0100)]
Add additional entries to unserialize corpus

These are useful to seed typed property fuzzing.

3 days agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 30 Nov 2020 13:24:05 +0000 (14:24 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix another ref source management bug in unserialize

3 days agoFix another ref source management bug in unserialize
Nikita Popov [Mon, 30 Nov 2020 13:23:17 +0000 (14:23 +0100)]
Fix another ref source management bug in unserialize

When we overwrite an existing property during unserialization,
we also have to drop the ref source from it.

3 days agoMerge branch 'PHP-8.0'
Christoph M. Becker [Mon, 30 Nov 2020 11:33:44 +0000 (12:33 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #76813: Access violation near NULL on source operand

3 days agoMerge branch 'PHP-7.4' into PHP-8.0
Christoph M. Becker [Mon, 30 Nov 2020 11:32:45 +0000 (12:32 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #76813: Access violation near NULL on source operand

3 days agoFix #76813: Access violation near NULL on source operand
Christoph M. Becker [Sat, 28 Nov 2020 12:47:37 +0000 (13:47 +0100)]
Fix #76813: Access violation near NULL on source operand

We avoid `YYCURSOR` becoming `NULL` by initializing `YYMARKER`, and add
a default rule for `<NORMAL>` where we catch unexpected input.

We also fix the only superficially related issue regarding empty input
followed by `T_SEPARATOR` and command, which caused another segfault.

Closes GH-6464.

3 days agoMerge branch 'PHP-8.0'
Dmitry Stogov [Mon, 30 Nov 2020 10:59:33 +0000 (13:59 +0300)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Disable JIT with incompatible third-party extensions

3 days agoDisable JIT with incompatible third-party extensions
Dmitry Stogov [Mon, 30 Nov 2020 10:58:34 +0000 (13:58 +0300)]
Disable JIT with incompatible third-party extensions

3 days agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 30 Nov 2020 10:42:07 +0000 (11:42 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fixed bug #80437

3 days agoFixed bug #80437
Nikita Popov [Mon, 30 Nov 2020 10:40:46 +0000 (11:40 +0100)]
Fixed bug #80437

Only chmod if the file has been created.

3 days agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 30 Nov 2020 10:19:13 +0000 (11:19 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Only replace IN_ARRAY result type for JMPZ/JMPNZ

3 days agoOnly replace IN_ARRAY result type for JMPZ/JMPNZ
Nikita Popov [Mon, 30 Nov 2020 10:09:28 +0000 (11:09 +0100)]
Only replace IN_ARRAY result type for JMPZ/JMPNZ

Replacing the result type in the general case is dangerous,
because not all opcodes support both VAR and TMP. One common case
is the in_array() result being passed to SEND_VAR, which would
have to be changed to SEND_VAL.

Rather than complicating this logic, reduce the scope to only
doing the type replacement for JMPZ and JMPNZ. The only reason
we're doing this in the first place is to enable the smart branch
optimization, so we can limit it to the relevant opcodes. Replacing
the result type may be marginally useful in other cases as well
(as it may avoid reference checks), but not worth the bother.

3 days agophp_tidy_create_node() expects a fixed set of node_types
Christoph M. Becker [Sun, 29 Nov 2020 23:53:43 +0000 (00:53 +0100)]
php_tidy_create_node() expects a fixed set of node_types

This static function is not supposed to deal with arbitrary
`node_type`s, so there is no need to do so.

Closes GH-6467.

3 days agoMerge branch 'PHP-8.0'
Nikita Popov [Mon, 30 Nov 2020 08:50:05 +0000 (09:50 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Use ephemeral ports in mcast_ipv*_recv.phpt

3 days agoUse ephemeral ports in mcast_ipv*_recv.phpt
Nikita Popov [Mon, 30 Nov 2020 08:47:03 +0000 (09:47 +0100)]
Use ephemeral ports in mcast_ipv*_recv.phpt

3 days agoMerge branch 'PHP-8.0'
Christoph M. Becker [Sun, 29 Nov 2020 23:29:55 +0000 (00:29 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  tidy::repairFile() and ::repairString() return string|false

3 days agotidy::repairFile() and ::repairString() return string|false
Christoph M. Becker [Sun, 29 Nov 2020 23:24:15 +0000 (00:24 +0100)]
tidy::repairFile() and ::repairString() return string|false

5 days agoFix typos in comments
Christoph M. Becker [Sat, 28 Nov 2020 12:50:14 +0000 (13:50 +0100)]
Fix typos in comments

5 days agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 27 Nov 2020 19:24:25 +0000 (20:24 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Respect strict_types during sccp function call evaluation

5 days agoRespect strict_types during sccp function call evaluation
Nikita Popov [Fri, 27 Nov 2020 19:20:48 +0000 (20:20 +0100)]
Respect strict_types during sccp function call evaluation

Similar to what we do with attributes, add a dummy call frame
on which we can set the strict_types flag.

5 days agoRemove duplicate str_split check, fix test expectation
Tyson Andre [Fri, 27 Nov 2020 17:21:54 +0000 (12:21 -0500)]
Remove duplicate str_split check, fix test expectation

5 days agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 27 Nov 2020 16:50:48 +0000 (17:50 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Don't check for throwing calls in sccp function evaluation

5 days agoDon't check for throwing calls in sccp function evaluation
Nikita Popov [Fri, 27 Nov 2020 16:40:34 +0000 (17:40 +0100)]
Don't check for throwing calls in sccp function evaluation

We only need to reject functions that could warn (or have runtime
dependent behavior). If a function can throw in some cases, just
let it and discard the result.

5 days agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 27 Nov 2020 16:44:48 +0000 (17:44 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix handling of sccp exceptions

5 days agoFix handling of sccp exceptions
Nikita Popov [Fri, 27 Nov 2020 16:43:24 +0000 (17:43 +0100)]
Fix handling of sccp exceptions

We should clear the exception *before* we destroy the execute_data.
Add a variation of the test that indirects through another file,
and would crash otherwise.

5 days agoMerge branch 'PHP-8.0'
Jakub Zelenka [Fri, 27 Nov 2020 16:35:46 +0000 (16:35 +0000)]
Merge branch 'PHP-8.0'

5 days agoMerge branch 'PHP-7.4' into PHP-8.0
Jakub Zelenka [Fri, 27 Nov 2020 16:35:16 +0000 (16:35 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0

5 days agoMerge branch 'PHP-7.3' into PHP-7.4
Jakub Zelenka [Fri, 27 Nov 2020 16:33:47 +0000 (16:33 +0000)]
Merge branch 'PHP-7.3' into PHP-7.4

5 days agoFix test for bug62890 to not depend on system cert store
Jakub Zelenka [Fri, 27 Nov 2020 16:32:43 +0000 (16:32 +0000)]
Fix test for bug62890 to not depend on system cert store

5 days agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 27 Nov 2020 16:04:56 +0000 (17:04 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix build for non-x86

5 days agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Fri, 27 Nov 2020 16:04:50 +0000 (17:04 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix build for non-x86

5 days agoFix build for non-x86
Nikita Popov [Fri, 27 Nov 2020 16:04:17 +0000 (17:04 +0100)]
Fix build for non-x86

5 days agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 27 Nov 2020 16:01:48 +0000 (17:01 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Handle exceptions during SCCP function evaluation

5 days agoHandle exceptions during SCCP function evaluation
Nikita Popov [Fri, 27 Nov 2020 16:00:12 +0000 (17:00 +0100)]
Handle exceptions during SCCP function evaluation

Easier to handle them than to ensure they can't happen in the
first place.

6 days agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 27 Nov 2020 13:49:57 +0000 (14:49 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix AVX detection

6 days agoMerge branch 'PHP-7.4' into PHP-8.0
Nikita Popov [Fri, 27 Nov 2020 13:49:45 +0000 (14:49 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix AVX detection

6 days agoFix AVX detection
Nikita Popov [Fri, 27 Nov 2020 10:54:39 +0000 (11:54 +0100)]
Fix AVX detection

Our CPU detection code currently only checks whether hardware
support for AVX exists. However, we also need to check for operating
system support for XSAVE, as well as whether XCR0 has the SSE and
AVX bits set.

If this is not the case, unset the AVX and AVX2 bits in the cpuinfo
structure.

Hopefully this resolves our issues with CPU support detection.

Closes GH-6460.

6 days agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 27 Nov 2020 13:18:35 +0000 (14:18 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Only use travis for cron jobs

6 days agoOnly use travis for cron jobs
Nikita Popov [Fri, 27 Nov 2020 13:15:34 +0000 (14:15 +0100)]
Only use travis for cron jobs

Our primary CI has been Azure Pipelines for a while now already.
Travis was primarily retained as a) a fast feedback builder and
b) to test architectures not available elsewhere.

Due to Travis CI open source policy changes, Travis is no longer
useful as a fast feedback builder. As such, only use it for cron
job builds.

6 days agoMerge branch 'PHP-8.0'
Nikita Popov [Fri, 27 Nov 2020 11:22:53 +0000 (12:22 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Make sure zend_cpu_supports_pclmul() is always defined

6 days agoMake sure zend_cpu_supports_pclmul() is always defined
Nikita Popov [Fri, 27 Nov 2020 11:22:03 +0000 (12:22 +0100)]
Make sure zend_cpu_supports_pclmul() is always defined

If __builtin_cpu_supports() is available, but doesn't have support
for pclmul, the function would end up not being defined at all.

6 days agoMerge branch 'PHP-8.0'
Christoph M. Becker [Fri, 27 Nov 2020 10:51:50 +0000 (11:51 +0100)]
Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix mysqli_get_client_stats test