]>
granicus.if.org Git - php/log
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)
Dmitry Stogov [Thu, 19 Dec 2019 20:11:08 +0000 (23:11 +0300)]
Fixed bug #78999 (Cycle leak when using function result as temporary)
Christoph M. Becker [Thu, 19 Dec 2019 12:21:52 +0000 (13:21 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78983: pdo_pgsql config.w32 cannot find libpq-fe.h
Christoph M. Becker [Thu, 19 Dec 2019 12:21:05 +0000 (13:21 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78983: pdo_pgsql config.w32 cannot find libpq-fe.h
SATO Kentaro [Tue, 17 Dec 2019 17:47:08 +0000 (02:47 +0900)]
Fix #78983: pdo_pgsql config.w32 cannot find libpq-fe.h
When configured with a path specified.
Nikita Popov [Thu, 19 Dec 2019 11:03:09 +0000 (12:03 +0100)]
Adjust test for notice->warning change
Nikita Popov [Thu, 19 Dec 2019 10:48:20 +0000 (11:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid signed integer overflow in string offset check
Nikita Popov [Thu, 19 Dec 2019 10:46:14 +0000 (11:46 +0100)]
Avoid signed integer overflow in string offset check
Cast to size_t before performing operations instead of afterwards.
Nikita Popov [Thu, 19 Dec 2019 09:43:23 +0000 (10:43 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add destructor annotations in ini parser
Nikita Popov [Thu, 19 Dec 2019 09:43:14 +0000 (10:43 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add destructor annotations in ini parser
Nikita Popov [Thu, 19 Dec 2019 09:42:10 +0000 (10:42 +0100)]
Add destructor annotations in ini parser
It would be better to switch this to use %union and %type annotations,
but not going to do that change for 7.3.
Nikita Popov [Wed, 18 Dec 2019 16:18:46 +0000 (17:18 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix leak in assign_ref with function
Nikita Popov [Wed, 18 Dec 2019 16:18:10 +0000 (17:18 +0100)]
Fix leak in assign_ref with function
As far as I can see, the retval copying is already done in all
callers of this function, so it should not be duplicated here.
Nikita Popov [Wed, 18 Dec 2019 14:56:10 +0000 (15:56 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78776
Nikita Popov [Wed, 18 Dec 2019 14:53:09 +0000 (15:53 +0100)]
Fixed bug #78776
By using the normal inheritance check if the parent is abstract
as well.
Remi Collet [Wed, 18 Dec 2019 13:18:16 +0000 (14:18 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix release date
fix release date
fix release date
Remi Collet [Wed, 18 Dec 2019 13:18:03 +0000 (14:18 +0100)]
fix release date
Remi Collet [Wed, 18 Dec 2019 13:17:49 +0000 (14:17 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix release date
fix release date
Remi Collet [Wed, 18 Dec 2019 13:17:31 +0000 (14:17 +0100)]
fix release date
Remi Collet [Wed, 18 Dec 2019 13:17:21 +0000 (14:17 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix release date
Remi Collet [Wed, 18 Dec 2019 13:16:19 +0000 (14:16 +0100)]
fix release date
Nikita Popov [Wed, 18 Dec 2019 10:41:11 +0000 (11:41 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78986
Nikita Popov [Wed, 18 Dec 2019 10:37:39 +0000 (11:37 +0100)]
Fixed bug #78986
Don't assume that handlers live in the arena, they may also be in
SHM.
Fabien Villepinte [Wed, 18 Dec 2019 10:10:10 +0000 (11:10 +0100)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Wed, 18 Dec 2019 10:08:24 +0000 (11:08 +0100)]
Add CONFLICTS tag
These tests can be the reason file_get_contents_variation8.phpt fails times to times.
Nikita Popov [Wed, 18 Dec 2019 10:04:51 +0000 (11:04 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Rethrow generator exception even without active stack frame
Nikita Popov [Wed, 18 Dec 2019 10:04:46 +0000 (11:04 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Rethrow generator exception even without active stack frame
Nikita Popov [Wed, 18 Dec 2019 10:02:44 +0000 (11:02 +0100)]
Rethrow generator exception even without active stack frame
Finally blocks in generators may be invoked during shutdown, in
which case we don't have a stack frame. Similar to what
zend_call_function does, we still need to rethrow these exceptions,
otherwise they will be hidden (and leak).
Nikita Popov [Wed, 18 Dec 2019 09:24:41 +0000 (10:24 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix use-after-free when trying to write to closure property
Nikita Popov [Wed, 18 Dec 2019 09:24:02 +0000 (10:24 +0100)]
Fix use-after-free when trying to write to closure property
Nikita Popov [Wed, 18 Dec 2019 09:11:40 +0000 (10:11 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix freeing of dynamic call name
Nikita Popov [Wed, 18 Dec 2019 09:11:23 +0000 (10:11 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix freeing of dynamic call name
Nikita Popov [Wed, 18 Dec 2019 09:10:30 +0000 (10:10 +0100)]
Fix freeing of dynamic call name
We need to free op2 if the call construction fails.
Also remove a redundant check for !call.
Nikita Popov [Wed, 18 Dec 2019 08:54:18 +0000 (09:54 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix const/cv freeing on failed reference assignment
Nikita Popov [Wed, 18 Dec 2019 08:53:30 +0000 (09:53 +0100)]
Fix const/cv freeing on failed reference assignment
Christoph M. Becker [Tue, 17 Dec 2019 19:01:44 +0000 (20:01 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
More updates to CONTRIBUTING.md
Christoph M. Becker [Tue, 17 Dec 2019 19:01:18 +0000 (20:01 +0100)]
More updates to CONTRIBUTING.md
7.4 is stable.