]>
granicus.if.org Git - php/log
Christoph M. Becker [Tue, 5 May 2020 09:39:38 +0000 (11:39 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79566: Private SHM is not private on Windows
Christoph M. Becker [Tue, 5 May 2020 07:31:17 +0000 (09:31 +0200)]
Fix #79566: Private SHM is not private on Windows
We map the POSIX semantics of `IPC_PRIVATE` by creating unnamed file
mapping objects on Windows. While that is not particularly useful for
ext/shmop, which is the only bundled extension which uses `shmget()`,
it may be useful for external extensions.
Christoph M. Becker [Mon, 4 May 2020 21:00:27 +0000 (23:00 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79561: dns_get_record() fails with DNS_ALL
Christoph M. Becker [Mon, 4 May 2020 14:51:51 +0000 (16:51 +0200)]
Fix #79561: dns_get_record() fails with DNS_ALL
Since Windows has its own definitions of the `PHP_DNS_*` macros, we
have to use these when registering the PHP constants.
Nikita Popov [Mon, 4 May 2020 14:27:45 +0000 (16:27 +0200)]
Fixed bug #79548
When duplicating user functions with static variables, make sure
that we init a new map ptr slot for the static variables.
Nikita Popov [Mon, 4 May 2020 12:52:18 +0000 (14:52 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79535
Nikita Popov [Mon, 4 May 2020 12:50:31 +0000 (14:50 +0200)]
Fixed bug #79535
We did not allocate a cache slot for FETCH_CLASS. This is already
fixed on newer PHP versions.
Nikita Popov [Mon, 4 May 2020 10:16:45 +0000 (12:16 +0200)]
Fix i386 build on Azure
Disabling postgresql entirely for now, because I can't figure out
how to fix it. Something broke big time with i386 packages on
Azure pipelines.
Christoph M. Becker [Mon, 4 May 2020 09:50:50 +0000 (11:50 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add basic sapi_windows_cp_conv() test
Christoph M. Becker [Mon, 4 May 2020 09:46:54 +0000 (11:46 +0200)]
Add basic sapi_windows_cp_conv() test
This function is lacking any tests so far.
Christoph M. Becker [Fri, 1 May 2020 10:38:03 +0000 (12:38 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79528: Different object of the same xml between 7.4.5 and 7.4.4
Christoph M. Becker [Fri, 1 May 2020 10:19:32 +0000 (12:19 +0200)]
Fix #79528: Different object of the same xml between 7.4.5 and 7.4.4
Revert "Fix #61597: SXE properties may lack attributes and content"
This reverts commit
7c081db885756d7b176a55b90b8746f664d1e042 .
Nikita Popov [Tue, 21 Apr 2020 10:03:49 +0000 (12:03 +0200)]
Reduce test parallelism on ARM64 CI
Let's go from 32 to 16 parallel jobs. We can reduce this further
if necessary.
Closes GH-5426.
Christoph M. Becker [Wed, 29 Apr 2020 09:12:03 +0000 (11:12 +0200)]
Pass worker ID to clean scripts
On Windows, reusing/sharing of OPcache instances with different
configuration is not necessarily supported, so we have to make that it
does not happen for the clean scripts, by using `$orig_ini_settings`
instead of `$clean_params`.
Xinchen Hui [Wed, 29 Apr 2020 10:58:48 +0000 (18:58 +0800)]
Merge branch 'PHP-7.4' of git.php.net:/php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:/php-src:
Fix #79532: sizeof off_t can be wrong
Make 045.phpt busy wait
Revert "Fix #79065: DOM classes do not expose properties to Reflection"
Bump version
Fix #79065: DOM classes do not expose properties to Reflection
Fix #79470: PHP incompatible with 3rd party file system on demand
Xinchen Hui [Wed, 29 Apr 2020 10:58:28 +0000 (18:58 +0800)]
Fixed bug #79536 (zend_clear_exception prevent exception's destructor to be called).
Christoph M. Becker [Tue, 28 Apr 2020 16:33:19 +0000 (18:33 +0200)]
Fix #79532: sizeof off_t can be wrong
We have to actually determine the proper `SIZEOF_OFF_T`.
Interestingly, it is `4` on Windows x64.
We also have to prevent the redefinition in pg_config.h. The clean
solution would likely be to not include pg_config.h at all, but that's
out of scope for BC reasons for now.
Nikita Popov [Wed, 29 Apr 2020 08:12:53 +0000 (10:12 +0200)]
Make 045.phpt busy wait
The timeout is only real-time based on Windows. Make this use
a busy wait loop instead. If hard_timeout is broken, this will
fail with a run-tests enforced timeout instead.
Nikita Popov [Tue, 28 Apr 2020 13:09:41 +0000 (15:09 +0200)]
Revert "Fix #79065: DOM classes do not expose properties to Reflection"
This reverts commit
6bc8f7e5a9949b2ba79376abd1ed13d0b4d0ae3c .
This causes an assertion failure in PHPUnit.
Christoph M. Becker [Tue, 28 Apr 2020 07:13:08 +0000 (09:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Bump version
Christoph M. Becker [Tue, 28 Apr 2020 07:10:50 +0000 (09:10 +0200)]
Bump version
Christoph M. Becker [Tue, 21 Apr 2020 11:28:01 +0000 (13:28 +0200)]
Fix #79065: DOM classes do not expose properties to Reflection
We add a `get_properties` handler which complements the already
existing `has_property` and `read_property`handlers.
Christoph M. Becker [Mon, 27 Apr 2020 07:31:21 +0000 (09:31 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79470: PHP incompatible with 3rd party file system on demand
Christoph M. Becker [Fri, 24 Apr 2020 15:24:25 +0000 (17:24 +0200)]
Fix #79470: PHP incompatible with 3rd party file system on demand
We add support for Activision HSM (`IO_REPARSE_TAG_ACTIVISION_HSM`) and
VFS for Git (`IO_REPARSE_TAG_PROJFS`). The latter fixes bug #78784.
Christoph M. Becker [Fri, 24 Apr 2020 12:51:44 +0000 (14:51 +0200)]
Fix #79514: Memory leaks while including unexistent file
We have to destroy (un-opened) ZEND_HANDLE_FILENAMEs.
Derick Rethans [Fri, 24 Apr 2020 11:31:32 +0000 (12:31 +0100)]
Updated to version 2020.1 (2020a)
Derick Rethans [Fri, 24 Apr 2020 11:31:32 +0000 (12:31 +0100)]
Empty merge
Derick Rethans [Fri, 24 Apr 2020 11:31:30 +0000 (12:31 +0100)]
Updated to version 2020.1 (2020a)
Christoph M. Becker [Thu, 23 Apr 2020 15:36:04 +0000 (17:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add additional preg_match test case
Graham Campbell [Tue, 7 Apr 2020 13:41:06 +0000 (15:41 +0200)]
Add additional preg_match test case
(cherry picked from commit
a1a044dcc74379fafb2b63db5ab033aa062aada7
on author's explicit request)
Nicolas Grekas [Wed, 15 Apr 2020 22:11:38 +0000 (00:11 +0200)]
Fix bug #79447
Partially reverts
846b6479537a112d1ded725e6484e46462048b35 : instead of
throwing, this skips uninitialized typed properties when serializing objects.
This makes serialize with __sleep() behave the same as serialize()
without __sleep().
As in the non-__sleep() case, unserialize(serialize($x)) identity
may not be preserved due to replacement of uninitialized/unset
properties with default values. Fixing this will require changes to
the serialization format.
Closes GH-5396.
Christoph M. Becker [Wed, 22 Apr 2020 13:08:13 +0000 (15:08 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79503: Memory leak on duplicate metadata
Christoph M. Becker [Wed, 22 Apr 2020 12:11:13 +0000 (14:11 +0200)]
Fix #79503: Memory leak on duplicate metadata
Duplicate metadata can only happen if someone tampers with the phar, so
we can and should treat that as error.
Graham Campbell [Tue, 7 Apr 2020 13:41:06 +0000 (15:41 +0200)]
Add additional preg_match test case
Christoph M. Becker [Mon, 6 Apr 2020 12:21:56 +0000 (14:21 +0200)]
Upgrade to PCRE2 10.34
We backport the slightly modified variant from master.
Nikita Popov [Mon, 20 Apr 2020 14:35:52 +0000 (16:35 +0200)]
Don't rand() in test
Instead use port 0 to get a free port from the OS.
Nikita Popov [Mon, 20 Apr 2020 10:07:46 +0000 (12:07 +0200)]
Fix file name clash in touch_variation1.phpt
Alex Dowad [Wed, 15 Apr 2020 13:25:14 +0000 (15:25 +0200)]
Fix bug #67369 ArrayObject serializatino drops the iterator class
When ArrayObject is round-tripped through serialize() and unserialize(),
it forgets any iterator class name which was set using ::setIteratorClass().
Fix that.
Christoph M. Becker [Mon, 20 Apr 2020 08:58:03 +0000 (10:58 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79491: Search for .user.ini extends up to root dir
Christoph M. Becker [Sun, 19 Apr 2020 12:22:24 +0000 (14:22 +0200)]
Fix #79491: Search for .user.ini extends up to root dir
The `start` parameter of `php_cgi_ini_activate_user_config` is supposed
to hold the byte offset of the doc root in the given `path`. However,
the current expression which fixes a potential type incompatibility
will ever only evaluate to zero or one, because it uses the *logical*
and operator (`&&`). Furthermore we notice that subtracting one from
`doc_root_len` is not necessary, so there is even no need for the
`start` parameter at all.
Nikita Popov [Mon, 20 Apr 2020 08:48:05 +0000 (10:48 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Apply doc root fix for FPM
Nikita Popov [Mon, 20 Apr 2020 08:46:20 +0000 (10:46 +0200)]
Apply doc root fix for FPM
This is the change from GH-5417 but for FPM. This was stripping the
last character from the doc_root. Given how it is used, this should
be harmless, but let's make it less confusing...
Nikita Popov [Mon, 20 Apr 2020 08:26:11 +0000 (10:26 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79497: Fix php_openssl_subtract_timeval()
Joe Cai [Sun, 19 Apr 2020 23:03:11 +0000 (09:03 +1000)]
Fix #79497: Fix php_openssl_subtract_timeval()
I stumbled upon this while debugging a strange issue with
stream_socket_client() where it randomly throws out errors when
the connection timeout is set to below 1s. The logic to calculate
time difference in php_openssl_subtract_timeval() is wrong when
a.tv_usec < b.tv_usec, causing connection errors before the timeout
is reached.
Dmitry Stogov [Fri, 17 Apr 2020 11:56:01 +0000 (14:56 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
zend_timeout() may access EX(opline)
Dmitry Stogov [Fri, 17 Apr 2020 11:55:14 +0000 (14:55 +0300)]
zend_timeout() may access EX(opline)
Nikita Popov [Thu, 16 Apr 2020 09:52:37 +0000 (11:52 +0200)]
Fix bug #79336
Make reading of floats and doubles host-endian independent.
Gabriel Caruso [Thu, 16 Apr 2020 09:38:27 +0000 (11:38 +0200)]
Move test to its folder
Nikita Popov [Thu, 16 Apr 2020 09:22:43 +0000 (11:22 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix MySQL local infile / attr handling on big endian systems
guirish [Fri, 10 Apr 2020 09:45:40 +0000 (05:45 -0400)]
Fix MySQL local infile / attr handling on big endian systems
Make sure pointer types match what is used by libmysql everywhere.
Closes GH-5380.
Nikita Popov [Wed, 15 Apr 2020 09:25:06 +0000 (11:25 +0200)]
Fix directory clash in tempnam_variation4 test
Nikita Popov [Wed, 15 Apr 2020 09:21:34 +0000 (11:21 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79477
Nikita Popov [Wed, 15 Apr 2020 09:20:33 +0000 (11:20 +0200)]
Fixed bug #79477
Make sure to deindirect properties when creating array.
Christoph M. Becker [Mon, 13 Apr 2020 21:24:40 +0000 (23:24 +0200)]
Fix #79472: ext/ffi/tests/040.phpt TC fails on Big endian arch
For now we are choosing the simplest solution, namely to skip the test
on big-endian architectures.
Christoph M. Becker [Tue, 14 Apr 2020 16:19:16 +0000 (18:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add missing CVE
Christoph M. Becker [Tue, 14 Apr 2020 16:18:18 +0000 (18:18 +0200)]
Add missing CVE
Sara Golemon [Tue, 14 Apr 2020 14:32:21 +0000 (10:32 -0400)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79468
NEWS
Sara Golemon [Tue, 14 Apr 2020 14:31:35 +0000 (10:31 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #79468
NEWS
dinosaur [Mon, 13 Apr 2020 23:46:34 +0000 (07:46 +0800)]
Fixed bug #79468
Close the stream filter resources when removing them from the stream.
Sara Golemon [Tue, 14 Apr 2020 14:25:37 +0000 (10:25 -0400)]
NEWS
Nikita Popov [Tue, 14 Apr 2020 14:08:07 +0000 (16:08 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Don't leak peername if accept fails
Nikita Popov [Tue, 14 Apr 2020 14:05:57 +0000 (16:05 +0200)]
Don't leak peername if accept fails
Even if the accept fails, the peername may be populated.
Christoph M. Becker [Tue, 14 Apr 2020 11:59:39 +0000 (13:59 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test cases
Christoph M. Becker [Tue, 14 Apr 2020 11:55:56 +0000 (13:55 +0200)]
Fix test cases
Nikita Popov [Tue, 14 Apr 2020 10:00:02 +0000 (12:00 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79468
dinosaur [Mon, 13 Apr 2020 23:46:34 +0000 (07:46 +0800)]
Fixed bug #79468
Close the stream filter resources when removing them from the stream.
Christoph M. Becker [Tue, 14 Apr 2020 06:55:48 +0000 (08:55 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add NEWS entries [ci skip]
Christoph M. Becker [Tue, 14 Apr 2020 06:53:35 +0000 (08:53 +0200)]
Add NEWS entries [ci skip]
Stanislav Malyshev [Tue, 14 Apr 2020 04:09:15 +0000 (21:09 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #79465 - use unsigneds as indexes.
Fix bug #79330 - make all execution modes consistent in rejecting \0
Stanislav Malyshev [Tue, 14 Apr 2020 04:09:08 +0000 (21:09 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #79465 - use unsigneds as indexes.
Fix bug #79330 - make all execution modes consistent in rejecting \0
Stanislav Malyshev [Tue, 14 Apr 2020 04:07:04 +0000 (21:07 -0700)]
Fix bug #79465 - use unsigneds as indexes.
Stanislav Malyshev [Tue, 14 Apr 2020 04:00:44 +0000 (21:00 -0700)]
Fix bug #79330 - make all execution modes consistent in rejecting \0
Nikita Popov [Fri, 3 Apr 2020 08:06:41 +0000 (10:06 +0200)]
Fixed bug #78434
The DO_INIT flag, which will skip the first resume on a primed
generator, should always be set when starting to yield from a
new generator, not only when the yield from happens during priming.
Nikita Popov [Wed, 8 Apr 2020 15:10:20 +0000 (17:10 +0200)]
Add php_cli_server_connect() helper
To encapsulate the repeated fsockopen() code.
This gives us a chance to control the timeout in one place:
Raise it to one second.
Nikita Popov [Wed, 8 Apr 2020 14:36:01 +0000 (16:36 +0200)]
Make mysqli_poll test more deterministic
Handle errors appearing in different order.
Christoph M. Becker [Wed, 8 Apr 2020 09:29:49 +0000 (11:29 +0200)]
Relax overly strict test expectation
There is no reason to expect a `1` after the PID; neither the session
ID nor the memory usage are required to contain one. Actually, we just
want to verify here, that the process with the $child_pid is running,
and is a php.exe process.
Christoph M. Becker [Wed, 8 Apr 2020 08:36:57 +0000 (10:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix memory leak introduced by fixing bug #78221
Christoph M. Becker [Wed, 8 Apr 2020 08:35:54 +0000 (10:35 +0200)]
Fix memory leak introduced by fixing bug #78221
We have to free the retrieved text content; to keep the code readable,
we extract a helper function to check for empty nodes. Unfortunately,
we cannot use xmlIsBlankNode(), because that also recognizes whitespace
only text content.
We also make sure to properly handle NULL returns from
xmlNodeGetContent().
Nikita Popov [Wed, 8 Apr 2020 07:41:14 +0000 (09:41 +0200)]
Fix test
George Peter Banyard [Tue, 7 Apr 2020 20:27:00 +0000 (22:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Revert "Went to fast and forgot to update tests"
Revert "Fix Bug #79448 0 is a valid Unicode codepoint, but mb_substitute_character(0) fails"
George Peter Banyard [Tue, 7 Apr 2020 20:24:40 +0000 (22:24 +0200)]
Revert "Went to fast and forgot to update tests"
This reverts commit
656eac74fa6074aebc087bb73d2e4651f7dc8c9e .
George Peter Banyard [Tue, 7 Apr 2020 20:23:24 +0000 (22:23 +0200)]
Revert "Fix Bug #79448 0 is a valid Unicode codepoint, but mb_substitute_character(0) fails"
This commit brings some substantial changes in behaviour due to the weird implementation.
This will be fixed in master due to BC concerns.
This reverts commit
1333b46d6dc0c293c1fd626803f91bc69743eb79 .
Christoph M. Becker [Tue, 7 Apr 2020 11:05:37 +0000 (13:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78221: DOMNode::normalize() doesn't remove empty text nodes
Christoph M. Becker [Wed, 11 Mar 2020 12:02:09 +0000 (13:02 +0100)]
Fix #78221: DOMNode::normalize() doesn't remove empty text nodes
If a text node is not followed by another text node, we remove it, if
its textContent is empty.
Christoph M. Becker [Mon, 6 Apr 2020 09:02:15 +0000 (11:02 +0200)]
Fix #69264: __debugInfo() ignored while extending SPL classes
We actually implement `::__debugInfo()` and drop the `get_debug_info()`
handlers of all relevant SPL classes. This is cleaner and gives more
flexibility regarding overriding the functionality in descendant
classes.
George Peter Banyard [Fri, 3 Apr 2020 20:10:56 +0000 (22:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
George Peter Banyard [Fri, 3 Apr 2020 20:03:00 +0000 (22:03 +0200)]
Went to fast and forgot to update tests
However due to the really lax conversion to integer all strings pass as 0
George Peter Banyard [Fri, 3 Apr 2020 19:28:07 +0000 (21:28 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
George Peter Banyard [Fri, 3 Apr 2020 19:16:04 +0000 (21:16 +0200)]
Fix Bug #79448 0 is a valid Unicode codepoint, but mb_substitute_character(0) fails
Nikita Popov [Fri, 3 Apr 2020 08:06:09 +0000 (10:06 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix incorrect free for last_message
Qianqian Bu [Fri, 3 Apr 2020 07:44:41 +0000 (15:44 +0800)]
Fix incorrect free for last_message
In commit
a7305eb539596e175bd6c3ae9a20953358c5d677 the last_message
field of the connection object was changed to be always non-persistent.
But there is a place on change_user path that still treats it
depending on conn->persistent flag. This will cause PHP crash after
com_change_user success when there is last_message set
Nikita Popov [Thu, 2 Apr 2020 14:34:21 +0000 (16:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79434
Nikita Popov [Thu, 2 Apr 2020 14:32:57 +0000 (16:32 +0200)]
Fixed bug #79434
Matteo Beccati [Wed, 1 Apr 2020 16:28:34 +0000 (18:28 +0200)]
Skip fpm tests not designed to be run as root
When running as root with TEST_FPM_RUN_AS_ROOT=1
Matteo Beccati [Wed, 1 Apr 2020 16:14:25 +0000 (18:14 +0200)]
Allow fpm tests to be run with long socket path
Socket path is restricted to ~100 bytes, so we can use
the system temp dir if the path ends up too long.
Christoph M. Becker [Wed, 1 Apr 2020 17:20:35 +0000 (19:20 +0200)]
Enable error diagnostic for check_default_conf_path.phpt
Otherwise we have no clue why the test failed, if the regex didn't
match.
Nikita Popov [Wed, 1 Apr 2020 12:21:59 +0000 (14:21 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix literal compaction collision between string and double
Nikita Popov [Wed, 1 Apr 2020 12:20:59 +0000 (14:20 +0200)]
Fix literal compaction collision between string and double
For the sake of simplicity I'm using a separate hashtable, rather
than trying to do hash perturabation on the double strings.
Christoph M. Becker [Wed, 1 Apr 2020 07:28:39 +0000 (09:28 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add NEWS entryc [ci skip]
Christoph M. Becker [Wed, 1 Apr 2020 07:26:20 +0000 (09:26 +0200)]
Add NEWS entryc [ci skip]