]>
granicus.if.org Git - php/log
Nikita Popov [Tue, 9 Feb 2021 11:20:56 +0000 (12:20 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Make getElementsByTagNameNS $namespace nullable
Nikita Popov [Tue, 9 Feb 2021 11:19:44 +0000 (12:19 +0100)]
Make getElementsByTagNameNS $namespace nullable
According to the DOM specification, this argument is supposed to
be nullable.
Nikita Popov [Thu, 7 Jan 2021 09:49:50 +0000 (10:49 +0100)]
Add support for string keys in array unpacking
This adds support for:
$array1 = ['a' => 1, 'b' => 2];
$array2 = ['b' => 3, 'c' => 4];
$array = [...$array1, ...$array2];
// => ['a' => 1, 'b' => 3, 'c' => 4]
RFC: https://wiki.php.net/rfc/array_unpacking_string_keys
Closes GH-6584.
George Peter Banyard [Wed, 3 Feb 2021 01:02:13 +0000 (01:02 +0000)]
Remove usage of float keys in arrays
Also make test output not produce trailling whitespaces
Closes GH-6662
Christoph M. Becker [Mon, 8 Feb 2021 22:13:19 +0000 (23:13 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Avoid C4090 level 1 warning
Christoph M. Becker [Mon, 8 Feb 2021 22:12:49 +0000 (23:12 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Avoid C4090 level 1 warning
Christoph M. Becker [Mon, 8 Feb 2021 22:11:37 +0000 (23:11 +0100)]
Avoid C4090 level 1 warning
This breaks the build for PHP 8 by default.
Máté Kocsis [Fri, 5 Feb 2021 12:46:46 +0000 (13:46 +0100)]
Generate class entries from stubs for another batch of extensions
Closes GH-6669
Christoph M. Becker [Mon, 8 Feb 2021 18:01:42 +0000 (19:01 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix locale dependent parsing of PostgreSQL version number
Christoph M. Becker [Mon, 8 Feb 2021 18:00:37 +0000 (19:00 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix locale dependent parsing of PostgreSQL version number
Christoph M. Becker [Fri, 5 Feb 2021 11:53:25 +0000 (12:53 +0100)]
Fix locale dependent parsing of PostgreSQL version number
Version numbers are not supposed to be localized, so we must not apply
locale dependent parsing with `atof()`.
Using `php_version_compare()` might even be better.
Closes GH-6668.
Christoph M. Becker [Mon, 8 Feb 2021 17:44:20 +0000 (18:44 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #80706: mail(): Headers after Bcc headers may be ignored
Christoph M. Becker [Mon, 8 Feb 2021 17:43:36 +0000 (18:43 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80706: mail(): Headers after Bcc headers may be ignored
Christoph M. Becker [Thu, 4 Feb 2021 16:43:53 +0000 (17:43 +0100)]
Fix #80706: mail(): Headers after Bcc headers may be ignored
We need to handle the case where a CRLF after a Bcc header is not the
beginning of a folding marker, because in that case the Bcc header was
not the last "thing".
Closes GH-6666.
Max Semenik [Fri, 5 Feb 2021 20:31:31 +0000 (23:31 +0300)]
run-tests.php: move JUnit stuff into a class
This is part one of my work that was announced at
https://externals.io/message/110391
Closes GH-6671.
Nikita Popov [Mon, 8 Feb 2021 08:49:33 +0000 (09:49 +0100)]
Skip two gettext tests under --repeat
gettext leaks global state across requests, so don't repeat these
tests. See also GH-6641.
Nikita Popov [Sun, 7 Feb 2021 17:02:58 +0000 (18:02 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Restore Laravel test workaround
Nikita Popov [Sun, 7 Feb 2021 16:34:01 +0000 (17:34 +0100)]
Restore Laravel test workaround
I accidentally dropped this during a merge, making the Laravel
job fail.
Tyson Andre [Sat, 6 Feb 2021 19:17:50 +0000 (14:17 -0500)]
Merge remote-tracking branch 'php.net/PHP-8.0'
Conflicts:
ext/zend_test/test.c
ext/zend_test/test.stub.php
ext/zend_test/test_arginfo.h
Tyson Andre [Sat, 6 Feb 2021 19:13:22 +0000 (14:13 -0500)]
Properly render 2+ namespaces functions in build/gen_stub.php
Affects ZEND_NS_FE
Add test cases of the global function
Backported to php 8.0 from GH-6664
Tyson Andre [Wed, 3 Feb 2021 14:57:27 +0000 (09:57 -0500)]
Properly render 2+ namespaces functions in build/gen_stub.php
Affects both INIT_NS_CLASS_ENTRY and ZEND_NS_FE
Add test cases of the global function and namespaced values
Closes GH-6664
Christoph M. Becker [Fri, 5 Feb 2021 13:55:45 +0000 (14:55 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix test expectation for PHP 8.0
Use ST_Y() instead of the deprecated/removed Y() in test
Christoph M. Becker [Fri, 5 Feb 2021 13:55:26 +0000 (14:55 +0100)]
Fix test expectation for PHP 8.0
Since float to string conversion is no longer locale dependent, we have
to expect a dot as decimal separator.
Christoph M. Becker [Fri, 5 Feb 2021 13:54:25 +0000 (14:54 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Use ST_Y() instead of the deprecated/removed Y() in test
Christoph M. Becker [Fri, 5 Feb 2021 13:53:19 +0000 (14:53 +0100)]
Use ST_Y() instead of the deprecated/removed Y() in test
Christoph M. Becker [Fri, 5 Feb 2021 12:12:30 +0000 (13:12 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #74779: x() and y() truncating floats to integers
Christoph M. Becker [Fri, 5 Feb 2021 12:11:22 +0000 (13:11 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #74779: x() and y() truncating floats to integers
Christoph M. Becker [Thu, 4 Feb 2021 13:43:17 +0000 (14:43 +0100)]
Fix #74779: x() and y() truncating floats to integers
We must not use the locale dependent `atof()`, but instead use the
(hopefully) locale independent `zend_strtod()`, when converting string
representations of floating point numbers which are sent by the server.
Closes GH-6665.
Nikita Popov [Thu, 4 Feb 2021 16:07:39 +0000 (17:07 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Try SIGTERM before SIGKILL in opcache restart
Nikita Popov [Thu, 4 Feb 2021 16:07:30 +0000 (17:07 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Try SIGTERM before SIGKILL in opcache restart
Nikita Popov [Mon, 7 Dec 2020 11:57:30 +0000 (12:57 +0100)]
Try SIGTERM before SIGKILL in opcache restart
SIGTERM is subject to HANDLE_BLOCK_INTERRUPTIONS(), which will
allow code to exit critical sections before it gets terminated.
Closes GH-6493.
Nikita Popov [Thu, 4 Feb 2021 14:24:20 +0000 (15:24 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix CLI server worker support
Nikita Popov [Thu, 4 Feb 2021 14:18:45 +0000 (15:18 +0100)]
Fix CLI server worker support
If we create separate listening sockets in each worker using
SO_REUSEADDR, then an incoming connection may be load-balanced
to a process that is already busy, either due to a long-running
request, or because it is a recursive request (in which case we
would deadlock).
Instead, only create one listening socket, and only create worker
forks afterwards. This way the incoming request will be served
by one of the workers that is currently listening for an incoming
connection.
Christoph M. Becker [Wed, 3 Feb 2021 11:45:47 +0000 (12:45 +0100)]
[ci skip] Merge branch 'PHP-8.0'
* PHP-8.0:
Fix newly introduced compiler warning
Christoph M. Becker [Wed, 3 Feb 2021 11:44:52 +0000 (12:44 +0100)]
[ci skip] Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix newly introduced compiler warning
Christoph M. Becker [Wed, 3 Feb 2021 11:43:15 +0000 (12:43 +0100)]
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix newly introduced compiler warning
Nikita Popov [Mon, 1 Feb 2021 08:46:17 +0000 (09:46 +0100)]
Fix newly introduced compiler warning
(cherry picked from commit
ab8177de2c89672e63a7a1ccef4df8f7bf34fbd2 )
David Gebler [Tue, 2 Feb 2021 15:44:21 +0000 (16:44 +0100)]
Add IL compat flag to Windows builds
Enabled by default; use `--disable-vs-link-compat` to disable.
Closes GH-6658.
Christoph M. Becker [Wed, 3 Feb 2021 10:25:02 +0000 (11:25 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #53467: Phar cannot compress large archives
Christoph M. Becker [Wed, 3 Feb 2021 10:23:59 +0000 (11:23 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #53467: Phar cannot compress large archives
Christoph M. Becker [Tue, 26 Jan 2021 16:46:32 +0000 (17:46 +0100)]
Fix #53467: Phar cannot compress large archives
When Phars are flushed, a new temporary file is created for each entry
which should be compressed, and the `compressed_filesize` is retrieved.
Afterwards, the Phar manifest is written, and only after that the files
are copied to the actual Phar. So for each such entry there is an open
temp file, what easily exceeds the limit.
Therefore, we use a single temporary file for all entries, and store
the start offset in the otherwise unused `header_offset` member. We
ensure that the `cfp` members are properly set to NULL even if flushing
fails, to avoid use after free scenarios.
This solution is based on a suggestion by @lserni[1].
Closes GH-6643.
[1] <https://github.com/box-project/box2/issues/80#issuecomment-
77147371 >
Máté Kocsis [Wed, 3 Feb 2021 08:03:18 +0000 (09:03 +0100)]
Generate class entries for a few extensions
Relates to GH-6644
Benjamin Eberlei [Tue, 2 Feb 2021 19:30:01 +0000 (20:30 +0100)]
[ci-skip] Merge branch 'PHP-8.0'
Benjamin Eberlei [Mon, 1 Feb 2021 20:11:12 +0000 (21:11 +0100)]
Fix bug #80600 DOMChildNode::remove does not work on DOMCharacterData.
Closes GH-6660
Christoph M. Becker [Tue, 2 Feb 2021 16:11:19 +0000 (17:11 +0100)]
[ci skip] Merge branch 'PHP-8.0'
* PHP-8.0:
7.3.28 is next
Christoph M. Becker [Tue, 2 Feb 2021 16:08:00 +0000 (17:08 +0100)]
[ci skip] Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
7.3.28 is next
Christoph M. Becker [Tue, 2 Feb 2021 16:03:05 +0000 (17:03 +0100)]
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
7.3.28 is next
Christoph M. Becker [Tue, 2 Feb 2021 16:01:55 +0000 (17:01 +0100)]
7.3.28 is next
Nikita Popov [Tue, 2 Feb 2021 15:47:03 +0000 (16:47 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Update year to 2021
Nikita Popov [Tue, 2 Feb 2021 15:46:52 +0000 (16:46 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Update year to 2021
Peter Kokot [Sun, 24 Jan 2021 11:23:20 +0000 (12:23 +0100)]
Update year to 2021
Closes GH-6636.
Nikita Popov [Tue, 2 Feb 2021 15:44:12 +0000 (16:44 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Remove unnecessary cast in snmp_set_oid_output_format
Nikita Popov [Tue, 2 Feb 2021 15:43:43 +0000 (16:43 +0100)]
Remove unnecessary cast in snmp_set_oid_output_format
This cast isn't needed, and could result in the ValueError being
skipped due to truncation.
Nikita Popov [Tue, 2 Feb 2021 09:32:25 +0000 (10:32 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Add missing derefs in CurlFile
Nikita Popov [Tue, 2 Feb 2021 09:32:11 +0000 (10:32 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add missing derefs in CurlFile
Nikita Popov [Tue, 2 Feb 2021 09:31:16 +0000 (10:31 +0100)]
Add missing derefs in CurlFile
As pointed out on GH-6456.
Nikita Popov [Tue, 2 Feb 2021 09:07:19 +0000 (10:07 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix persistent leak on load_wsdl_ex failure
Nikita Popov [Tue, 2 Feb 2021 09:07:04 +0000 (10:07 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix persistent leak on load_wsdl_ex failure
Nikita Popov [Tue, 2 Feb 2021 09:05:35 +0000 (10:05 +0100)]
Fix persistent leak on load_wsdl_ex failure
Move the load_wsdl_ex call into the zend_try that destroys the
docs hash table. The wsdl will be inserted into docs early on,
and will thus be released on subsequent bailout.
Christoph M. Becker [Mon, 1 Feb 2021 12:44:42 +0000 (13:44 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Revert "Updated to version 2021.1 (2021a)"
Christoph M. Becker [Mon, 1 Feb 2021 12:43:57 +0000 (13:43 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Revert "Updated to version 2021.1 (2021a)"
Christoph M. Becker [Mon, 1 Feb 2021 12:42:43 +0000 (13:42 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Revert "Updated to version 2021.1 (2021a)"
Christoph M. Becker [Mon, 1 Feb 2021 12:41:32 +0000 (13:41 +0100)]
Revert "Updated to version 2021.1 (2021a)"
This reverts commit
491488d21707062fa8e9b9187db3585fb0d347da , since
PHP-7.3 is in security mode, and this does not look security related.
Christoph M. Becker [Mon, 1 Feb 2021 12:01:27 +0000 (13:01 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #80654: file_get_contents() maxlen fails above (2**31)-1 bytes
Christoph M. Becker [Mon, 1 Feb 2021 11:59:22 +0000 (12:59 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80654: file_get_contents() maxlen fails above (2**31)-1 bytes
Christoph M. Becker [Thu, 28 Jan 2021 16:00:16 +0000 (17:00 +0100)]
Fix #80654: file_get_contents() maxlen fails above (2**31)-1 bytes
We remove the arbitrary restriction to `INT_MAX`; it is superfluous on
32bit systems where `ZEND_LONG_MAX == INT_MAX` anyway, and not useful
on 64bit systems, where larger files should be readable, if the
`memory_limit` is large enough.
Closes GH-6648.
Levi Morrison [Mon, 1 Feb 2021 05:32:24 +0000 (22:32 -0700)]
Document .dtor_obj and .free_obj
Closes GH-6656.
Co-authored-by: Nikita Popov <nikic@php.net>
twosee [Mon, 1 Feb 2021 04:56:59 +0000 (12:56 +0800)]
Fix environment variable not work in run-tests.php
Closes GH-6657.
David CARLIER [Sat, 30 Jan 2021 09:47:52 +0000 (09:47 +0000)]
Fix ubsan warning on macos
Closes GH-6652.
Nikita Popov [Mon, 1 Feb 2021 09:24:18 +0000 (10:24 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
XFAIL observer_error_05.phpt test
Nikita Popov [Mon, 1 Feb 2021 09:24:00 +0000 (10:24 +0100)]
XFAIL observer_error_05.phpt test
Nikita Popov [Mon, 1 Feb 2021 09:10:09 +0000 (10:10 +0100)]
Create .php and .sh on valgrind failure
Nikita Popov [Mon, 1 Feb 2021 08:49:19 +0000 (09:49 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix Laravel build on community job
Nikita Popov [Mon, 1 Feb 2021 08:49:13 +0000 (09:49 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix Laravel build on community job
Nikita Popov [Thu, 28 Jan 2021 09:24:48 +0000 (10:24 +0100)]
Fix Laravel build on community job
Now requires PHP 7.4, so use php7.4 to run composer everywhere.
Nikita Popov [Mon, 1 Feb 2021 08:46:39 +0000 (09:46 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix build
crc32 mac build fix
Nikita Popov [Mon, 1 Feb 2021 08:46:27 +0000 (09:46 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix build
Nikita Popov [Mon, 1 Feb 2021 08:46:17 +0000 (09:46 +0100)]
Fix build
David CARLIER [Sat, 30 Jan 2021 09:45:01 +0000 (09:45 +0000)]
crc32 mac build fix
Closes GH-6651.
Stanislav Malyshev [Mon, 1 Feb 2021 08:17:02 +0000 (00:17 -0800)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug #80672 - Null Dereference in SoapClient
Stanislav Malyshev [Mon, 1 Feb 2021 05:42:48 +0000 (21:42 -0800)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #80672 - Null Dereference in SoapClient
Stanislav Malyshev [Mon, 1 Feb 2021 05:42:41 +0000 (21:42 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #80672 - Null Dereference in SoapClient
Stanislav Malyshev [Mon, 1 Feb 2021 05:15:23 +0000 (21:15 -0800)]
Fix bug #80672 - Null Dereference in SoapClient
Christoph M. Becker [Thu, 28 Jan 2021 22:26:26 +0000 (23:26 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Add missing stub for SodiumException
Christoph M. Becker [Thu, 28 Jan 2021 18:01:20 +0000 (19:01 +0100)]
Add missing stub for SodiumException
Closes GH-6649.
Remi Collet [Thu, 28 Jan 2021 15:27:00 +0000 (16:27 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
NEWS
NEWS
Fix #80682 opcache doesn't honour pcre.jit option
Remi Collet [Thu, 28 Jan 2021 15:26:46 +0000 (16:26 +0100)]
NEWS
Remi Collet [Thu, 28 Jan 2021 15:26:26 +0000 (16:26 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
NEWS
Fix #80682 opcache doesn't honour pcre.jit option
Remi Collet [Thu, 28 Jan 2021 15:25:35 +0000 (16:25 +0100)]
NEWS
Remi Collet [Thu, 28 Jan 2021 15:24:39 +0000 (16:24 +0100)]
Fix #80682 opcache doesn't honour pcre.jit option
Dmitry Stogov [Thu, 28 Jan 2021 13:38:36 +0000 (16:38 +0300)]
Remove useless zend_update_class_constants() calls
Nikita Popov [Tue, 26 Jan 2021 14:53:49 +0000 (15:53 +0100)]
Move optimizer into core
This only moves the files, adjusts the build system, exports APIs
and does minor fixups to make sure the code builds.
This does not yet try to make the optimizer usable independently
of opcache.
Closes GH-6642.
Nikita Popov [Thu, 28 Jan 2021 09:15:45 +0000 (10:15 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix stub for Serializable::serialize()
Michael Voříšek [Wed, 27 Jan 2021 12:54:15 +0000 (13:54 +0100)]
Fix stub for Serializable::serialize()
This method may also return null.
Nikita Popov [Thu, 28 Jan 2021 09:04:17 +0000 (10:04 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Observe fake closures
Sammy Kaye Powers [Fri, 15 Jan 2021 18:07:40 +0000 (10:07 -0800)]
Observe fake closures
Closes GH-6607.
Stanislav Malyshev [Wed, 27 Jan 2021 08:19:21 +0000 (00:19 -0800)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:18:49 +0000 (00:18 -0800)]
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:15:50 +0000 (00:15 -0800)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:15:43 +0000 (00:15 -0800)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Rm unneeded function