]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 30 Dec 2019 16:24:16 +0000 (17:24 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79046
Nikita Popov [Mon, 30 Dec 2019 16:22:50 +0000 (17:22 +0100)]
Fixed bug #79046
Christoph M. Becker [Mon, 30 Dec 2019 16:21:50 +0000 (17:21 +0100)]
Fix typo
Máté Kocsis [Sun, 29 Dec 2019 20:14:36 +0000 (21:14 +0100)]
Convert zend_parse_parameters_none() to fast ZPP in standard lib
Closes GH-5037
Christoph M. Becker [Mon, 30 Dec 2019 14:18:25 +0000 (15:18 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79040: Warning Opcode handlers are unusable due to ASLR
Christoph M. Becker [Mon, 30 Dec 2019 14:17:03 +0000 (15:17 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79040: Warning Opcode handlers are unusable due to ASLR
Christoph M. Becker [Mon, 30 Dec 2019 11:20:31 +0000 (12:20 +0100)]
Fix #79040: Warning Opcode handlers are unusable due to ASLR
We must not use the same shared memory OPcache instance for different
SAPIs, since their memory layout is different. To avoid this, we add
the SAPI name (truncated to at most 20 characters) to the names of the
memory base file, the mutex and the file mapping.
Wouter Wijsman [Tue, 17 Dec 2019 08:13:41 +0000 (09:13 +0100)]
Add FILTER_VALIDATE_BOOL as alias for FILTER_VALIDATE_BOOLEAN
Both filters are equivalent, but FILTER_VALIDATE_BOOL uses our
canonical name for the type (the only one permitted in type
declarations for example), so the new name is preferred long
term.
The old name may be deprecated in the future, but no specific
timeline is planned.
Nikita Popov [Mon, 30 Dec 2019 12:29:32 +0000 (13:29 +0100)]
Fix SSA construction for ADD_ARRAY_ELEMENT in RC_INFERENCE mode
This was broken in
cc29cbe80c0944097f8980384f883907d46512ce .
Nikita Popov [Mon, 30 Dec 2019 11:27:31 +0000 (12:27 +0100)]
Regenerate stubs
Looks like these GD changes got lost along the way...
Nikita Popov [Mon, 30 Dec 2019 10:31:56 +0000 (11:31 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add test for bug #79031
Revert "Increase serialize_lock while decoding session"
Nikita Popov [Mon, 30 Dec 2019 10:31:27 +0000 (11:31 +0100)]
Add test for bug #79031
Fixed by preceding revert.
Nikita Popov [Mon, 30 Dec 2019 10:27:13 +0000 (11:27 +0100)]
Revert "Increase serialize_lock while decoding session"
This reverts commit
b8ef7c35abd31666d9fb317db4b09a9eef0ede6c .
See bug #79031. The semantics of serialize locking aren't quite
correct right now, and the use of the lock in this particular
place makes us hit the issue in a common case. I'm reverting this
commit for PHP 7.4 and will try to fix this properly for PHP 8,
as I believe it will require ABI breakage.
Christoph M. Becker [Sat, 28 Dec 2019 10:02:03 +0000 (11:02 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add missing skipif clause
Christoph M. Becker [Sat, 28 Dec 2019 10:01:22 +0000 (11:01 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add missing skipif clause
Christoph M. Becker [Sat, 28 Dec 2019 10:00:37 +0000 (11:00 +0100)]
Add missing skipif clause
Christoph M. Becker [Sat, 28 Dec 2019 09:49:56 +0000 (10:49 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79033: Curl timeout error with specific url and post
Christoph M. Becker [Sat, 28 Dec 2019 09:47:52 +0000 (10:47 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79033: Curl timeout error with specific url and post
Christoph M. Becker [Sat, 28 Dec 2019 09:47:03 +0000 (10:47 +0100)]
Fix #79033: Curl timeout error with specific url and post
We must not set an empty mime structure as `CURLOPT_MIMEPOST`; instead
we set it to `NULL` if `CURLOPT_POSTFIELDS` has been set to an empty
array.
Nikita Popov [Fri, 27 Dec 2019 16:31:27 +0000 (17:31 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Handle empty password fast path in caching_sha2_password
Handle error response during caching_sha2_password auth
Add support for caching_sha2_password in change user authentication
Fix unix socket check during caching_sha2_password
Support auth switch request during caching sha2 auth
Nikita Popov [Fri, 27 Dec 2019 15:17:10 +0000 (16:17 +0100)]
Handle empty password fast path in caching_sha2_password
If an empty password is used, no additional packets are exchanged
during caching_sha2_password auth. We're only looking for an
OK/ERR response.
Nikita Popov [Fri, 27 Dec 2019 15:07:28 +0000 (16:07 +0100)]
Handle error response during caching_sha2_password auth
In particular, this fixes handling of expired passwords.
Nikita Popov [Fri, 27 Dec 2019 13:40:54 +0000 (14:40 +0100)]
Add support for caching_sha2_password in change user authentication
Same as for connection handshakes.
Nikita Popov [Fri, 27 Dec 2019 12:27:10 +0000 (13:27 +0100)]
Fix unix socket check during caching_sha2_password
The fact that conn->unix_socket is set does not mean that a Unix
socket is actually in use -- this member is set in a default
configuration.
Instead check whether a unix_socket stream ops is used.
Nikita Popov [Fri, 27 Dec 2019 11:37:51 +0000 (12:37 +0100)]
Support auth switch request during caching sha2 auth
Nikita Popov [Fri, 27 Dec 2019 16:26:42 +0000 (17:26 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't use PASSWORD() function in test
Specify explicit row order in PDO MySQL test
Skip bug77956.phpt if local_infile disabled on server
Don't check TIMESTAMP NOT NULL in fetch_field_flags test
Don't test the RENAME DATABASE query
Make GeomFromText tests compatible with MySQL 8
Nikita Popov [Fri, 27 Dec 2019 15:21:21 +0000 (16:21 +0100)]
Don't use PASSWORD() function in test
Doesn't exist anymore in MySQL 8.
Nikita Popov [Fri, 27 Dec 2019 15:39:46 +0000 (16:39 +0100)]
Specify explicit row order in PDO MySQL test
Nikita Popov [Fri, 27 Dec 2019 15:31:34 +0000 (16:31 +0100)]
Skip bug77956.phpt if local_infile disabled on server
Nikita Popov [Fri, 27 Dec 2019 13:02:18 +0000 (14:02 +0100)]
Don't check TIMESTAMP NOT NULL in fetch_field_flags test
The behavior of this is very dependent on the MySQL vendor, MySQL
version and MySQL configuration, in particular the
explicit_defaults_for_timestamp variable.
I don't think it's worthwhile to try and model this exactly, so
drop the test.
Nikita Popov [Fri, 27 Dec 2019 12:45:00 +0000 (13:45 +0100)]
Don't test the RENAME DATABASE query
Apparently this only existed for a short time, because it was
found to be insecure. Don't try to test it.
Nikita Popov [Fri, 27 Dec 2019 12:38:14 +0000 (13:38 +0100)]
Make GeomFromText tests compatible with MySQL 8
The function has been renamed to ST_GeomFromText.
Christoph M. Becker [Fri, 27 Dec 2019 14:11:51 +0000 (15:11 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Skip test for clang builds
Christoph M. Becker [Fri, 27 Dec 2019 14:01:09 +0000 (15:01 +0100)]
Skip test for clang builds
On Windows, clang builds don't use __vectorcall, so executing this test
does not make sense.
Christoph M. Becker [Fri, 27 Dec 2019 09:11:01 +0000 (10:11 +0100)]
Clarify usage of max_fd in php_poll2() on Windows
Actually, `max_fd` is not used on Windows, since `PHP_SAFE_MAX_FD` and
`select` ignore it; so it makes no sense to calculate it in the loop.
Even worse, since `php_socket_t` is unsigned on Windows, it will never
be modified during the loop, because `SOCK_ERR` is already the largest
representable value of that type.
Therefore we skip the loop on Windows, and add a clarifying comment.
Dmitry Stogov [Thu, 26 Dec 2019 13:32:45 +0000 (16:32 +0300)]
Fixed type_info for new array element (it may be only NULL)
Dmitry Stogov [Thu, 26 Dec 2019 08:54:05 +0000 (11:54 +0300)]
cleanup
Christoph M. Becker [Wed, 25 Dec 2019 11:36:25 +0000 (12:36 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter).
Christoph M. Becker [Wed, 25 Dec 2019 11:34:47 +0000 (12:34 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter).
Xinchen Hui [Wed, 25 Dec 2019 11:05:44 +0000 (12:05 +0100)]
Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter).
We backport the fix PHP 7.3, since this branch is affected as well.
(cherry picked from commit
b5e004379647bd1ebb75eb2eac8826fb6abdd3d8 )
(cherry picked from commit
e36daa6927c05d2e687bb77495ef206cde118b33 )
(cherry picked from commit
2704ee6844c03348de9d15e74646d09007ef0f7c )
Christoph M. Becker [Wed, 25 Dec 2019 11:09:37 +0000 (12:09 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test case
Christoph M. Becker [Wed, 25 Dec 2019 11:05:44 +0000 (12:05 +0100)]
Fix test case
As of PHP 7.3.0, unlinking files with open handles is possible on
Windows, but these file entries are still blocked until all open
handles are closed. Since this test doesn't require to write to the
same file, we use three separate files.
We also add the missing skip check for XMLReader.
Xinchen Hui [Wed, 25 Dec 2019 08:29:30 +0000 (16:29 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter).
Xinchen Hui [Wed, 25 Dec 2019 07:55:15 +0000 (15:55 +0800)]
Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter).
Xinchen Hui [Wed, 25 Dec 2019 07:28:13 +0000 (15:28 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter)"
Xinchen Hui [Wed, 25 Dec 2019 07:27:10 +0000 (15:27 +0800)]
Revert "Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter)"
This reverts commit
d8ad2f4695ebd6dc2d4e668d9baeac1c071791a6 .
Xinchen Hui [Wed, 25 Dec 2019 05:18:23 +0000 (13:18 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter)
Partial fix for bug #79029
Conflicts:
ext/xmlwriter/php_xmlwriter.c
Xinchen Hui [Wed, 25 Dec 2019 05:14:08 +0000 (13:14 +0800)]
Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter)
Xinchen Hui [Wed, 25 Dec 2019 04:43:44 +0000 (12:43 +0800)]
Partial fix for bug #79029
Dmitry Stogov [Tue, 24 Dec 2019 13:15:24 +0000 (16:15 +0300)]
Build call graph before type inference
Xinchen Hui [Tue, 24 Dec 2019 09:09:44 +0000 (17:09 +0800)]
Implemented FR #78638 (__PHP_Incomplete_Class should be final)
This should be minor and won't impact anyone
Xinchen Hui [Tue, 24 Dec 2019 06:21:52 +0000 (14:21 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Similar problem (#79022) also exists in Interfaces
Fixed bug #79022 (class_exists returns True for classes that are not ready to be used)
Xinchen Hui [Tue, 24 Dec 2019 06:20:55 +0000 (14:20 +0800)]
Similar problem (#79022) also exists in Interfaces
Xinchen Hui [Tue, 24 Dec 2019 06:04:19 +0000 (14:04 +0800)]
Fixed bug #79022 (class_exists returns True for classes that are not ready to be used)
Dmitry Stogov [Mon, 23 Dec 2019 11:14:47 +0000 (14:14 +0300)]
Set opcode handler
Christoph M. Becker [Sat, 21 Dec 2019 10:58:00 +0000 (11:58 +0100)]
Fix #78880: Spelling error report
We fix the most often occuring typos according to a recent codespell
report[1] in tests, code comments and documentation.
[1] <https://fossies.org/linux/test/php-src-master-
f8f48ce .191129.tar.gz/codespell.html>.
Máté Kocsis [Fri, 20 Dec 2019 16:53:53 +0000 (17:53 +0100)]
Promote warning to exception for proc_open() when null byte is encountered
GH-5004
Nikita Popov [Fri, 20 Dec 2019 16:46:43 +0000 (17:46 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix leak when generator closed during yield in finally
Nikita Popov [Fri, 20 Dec 2019 15:15:24 +0000 (16:15 +0100)]
Fix leak when generator closed during yield in finally
In this case we need to free any pending exceptions or return values
that will be discarded.
Máté Kocsis [Fri, 20 Dec 2019 14:04:00 +0000 (15:04 +0100)]
Remove unnecessary FN type information from OPCache
GH-5029
Máté Kocsis [Wed, 20 Nov 2019 01:34:52 +0000 (02:34 +0100)]
Promote warnings to exceptions in string search related functions
GH-5004
Máté Kocsis [Wed, 20 Nov 2019 01:30:48 +0000 (02:30 +0100)]
Promote warnings to exceptions in proc_open() function
GH-5004
Máté Kocsis [Wed, 20 Nov 2019 01:27:46 +0000 (02:27 +0100)]
Promote warrnings to exceptions in chgrp() function
GH-5004
Máté Kocsis [Wed, 20 Nov 2019 01:22:44 +0000 (02:22 +0100)]
Promote warning to exception in dns_check_record() function
GH-5004
Christoph M. Becker [Fri, 20 Dec 2019 15:29:39 +0000 (16:29 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79008: General performance regression with PHP 7.4 on Windows
Christoph M. Becker [Fri, 20 Dec 2019 15:23:32 +0000 (16:23 +0100)]
Fix #79008: General performance regression with PHP 7.4 on Windows
We no longer try to retrieve the filename of a given stream when
fstat'ing, because this is very slow. Since we neither didn't do that
in PHP 7.3 and earlier, we regard this as sensible trade-off.
GITSRC [Fri, 20 Dec 2019 14:15:15 +0000 (15:15 +0100)]
Simplify constant expression
Co-Authored-By: Christoph M. Becker <cmbecker69@gmx.de>
Nikita Popov [Fri, 20 Dec 2019 14:13:27 +0000 (15:13 +0100)]
Fix merge mistake
Máté Kocsis [Fri, 20 Dec 2019 10:10:20 +0000 (11:10 +0100)]
Make get_defined_vars() always return an array
GH-5025
Máté Kocsis [Wed, 18 Dec 2019 19:44:53 +0000 (20:44 +0100)]
Fix F1 type information in OPCache
Closes GH-5025
Máté Kocsis [Wed, 18 Dec 2019 19:38:40 +0000 (20:38 +0100)]
Fix smaller issues with stubs
GH-5025
Nikita Popov [Fri, 20 Dec 2019 12:52:08 +0000 (13:52 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Try to make proc_open_bug69900.phpt more robust
Nikita Popov [Fri, 20 Dec 2019 12:51:31 +0000 (13:51 +0100)]
Try to make proc_open_bug69900.phpt more robust
Nikita Popov [Fri, 20 Dec 2019 11:11:07 +0000 (12:11 +0100)]
Fix string offset signed int UB in jit as well
Nikita Popov [Fri, 20 Dec 2019 11:06:24 +0000 (12:06 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78982: pdo_pgsql returns dead persistent connection
Nikita Popov [Fri, 20 Dec 2019 11:05:39 +0000 (12:05 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78982: pdo_pgsql returns dead persistent connection
SATO Kentaro [Tue, 17 Dec 2019 17:36:03 +0000 (02:36 +0900)]
Fix #78982: pdo_pgsql returns dead persistent connection
Call PQconsumeInput() before PQstatus() to update the status.
Máté Kocsis [Tue, 17 Dec 2019 21:17:47 +0000 (22:17 +0100)]
Remove unnecessary F0 type information from OPCache
Closes GH-5024
Máté Kocsis [Tue, 17 Dec 2019 21:17:17 +0000 (22:17 +0100)]
Fix return type of strval()
GH-5024
Máté Kocsis [Mon, 16 Dec 2019 18:30:14 +0000 (19:30 +0100)]
Add stubs for standard library
Closes GH-5017
Máté Kocsis [Mon, 16 Dec 2019 18:29:51 +0000 (19:29 +0100)]
Promote warnings to exceptions in stream-related functions
GH-5017
Nikita Popov [Fri, 20 Dec 2019 10:45:50 +0000 (11:45 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78980: pgsqlGetNotify() overlooks dead connection
Nikita Popov [Fri, 20 Dec 2019 10:44:23 +0000 (11:44 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78980: pgsqlGetNotify() overlooks dead connection
SATO Kentaro [Tue, 17 Dec 2019 17:16:55 +0000 (02:16 +0900)]
Fix #78980: pgsqlGetNotify() overlooks dead connection
pgsqlGetNotify() didn't check result of PQconsumeInput().
Nikita Popov [Fri, 20 Dec 2019 10:38:01 +0000 (11:38 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79000
Nikita Popov [Thu, 19 Dec 2019 12:27:09 +0000 (13:27 +0100)]
Fixed bug #79000
Don't report EAGAIN/EWOULDBLOCK as errors for fwrite on
non-blocking socket streams. This matches behavior for fread,
as well as behavior for plain file streams.
Closes GH-5026.
BohwaZ [Tue, 10 Dec 2019 11:16:46 +0000 (12:16 +0100)]
Add setAuthorizer method to SQLite3
This adds the possibility to define a userland callback that will be
used to authorize or not an action on the database.
Nikita Popov [Fri, 20 Dec 2019 10:24:14 +0000 (11:24 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #74170: locale information change after mime_content_type
Nikita Popov [Fri, 20 Dec 2019 10:24:03 +0000 (11:24 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #74170: locale information change after mime_content_type
Sergei Turchanov [Thu, 29 Aug 2019 07:29:19 +0000 (17:29 +1000)]
Fix #74170: locale information change after mime_content_type
Some functions in libmagic (distributed with fileinfo extension) perform this sequence of calls:
func() {
setlocale(LC_TYPE, "C")
.. do some work ..
setlocale(LC_TYPE, "")
}
It effectively resets LC_TYPE if it that was set before the function call.
To avoid manipulations with current locale at all, the problematic functions
were modified to use locale-independent functions.
Nikita Popov [Fri, 20 Dec 2019 10:03:15 +0000 (11:03 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78402: pcntl_signal() misleading error message
Nikita Popov [Fri, 20 Dec 2019 10:02:57 +0000 (11:02 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78402: pcntl_signal() misleading error message
SATO Kentaro [Tue, 17 Dec 2019 19:03:42 +0000 (04:03 +0900)]
Fix #78402: pcntl_signal() misleading error message
An error message can be misleading when a handler
passed to pcntl_signal() is not callable.
Nikita Popov [Fri, 20 Dec 2019 09:35:50 +0000 (10:35 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix early free of assign_obj op_data
Nikita Popov [Fri, 20 Dec 2019 09:33:18 +0000 (10:33 +0100)]
Fix early free of assign_obj op_data
We need to make sure that op_data is only freed after populating
result, as op_data may be the only thing holding the value in the
case of an overloaded assignment.
This reverts the code to how it looked like in 7.3.
Máté Kocsis [Mon, 9 Dec 2019 23:03:02 +0000 (00:03 +0100)]
Convert string|array union parameter types
Closes GH-4995
Dmitry Stogov [Fri, 20 Dec 2019 03:46:25 +0000 (06:46 +0300)]
RECV opcode optimization
Máté Kocsis [Thu, 19 Dec 2019 21:58:26 +0000 (22:58 +0100)]
Add upgrading note about implode() [ci skip]
Dmitry Stogov [Thu, 19 Dec 2019 20:19:31 +0000 (23:19 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78999 (Cycle leak when using function result as temporary)
Dmitry Stogov [Thu, 19 Dec 2019 20:17:39 +0000 (23:17 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #78999 (Cycle leak when using function result as temporary)