]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 17 Mar 2021 15:34:18 +0000 (16:34 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix signed/unsigned warnings in PDO ODBC
Nikita Popov [Mon, 14 Dec 2020 09:02:25 +0000 (10:02 +0100)]
Fix signed/unsigned warnings in PDO ODBC
Add add skipif to test.
(cherry picked from commit
aa58db723221ec891d4432621003bfa55dc15edf )
Nikita Popov [Wed, 17 Mar 2021 14:53:33 +0000 (15:53 +0100)]
Use absolute paths in tokenizer_data_gen.php
To make it work with out-of-tree builds.
Christoph M. Becker [Wed, 17 Mar 2021 14:09:18 +0000 (15:09 +0100)]
Initalize return_value before use
Otherwise we likely segfault[1]. We fix the same issue for
PDO_Firebird as well.
[1] <https://ci.appveyor.com/project/php/php-src/builds/
38267250 /job/6y3ngn1k6ryxx6j3?fullLog=true#L9783>
Closes GH-6785.
Nikita Popov [Wed, 17 Mar 2021 14:09:26 +0000 (15:09 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
imagecolortransparent() cannot return null
Nikita Popov [Wed, 17 Mar 2021 14:09:06 +0000 (15:09 +0100)]
imagecolortransparent() cannot return null
Nikita Popov [Wed, 17 Mar 2021 14:06:46 +0000 (15:06 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Return bool from imageinterlace()
Nikita Popov [Wed, 17 Mar 2021 14:05:09 +0000 (15:05 +0100)]
Return bool from imageinterlace()
The function accepts a bool since PHP 8.0, so it should also return
a bool to keep things consistent.
Furthermore a null return from this functions is not possible.
Dmitry Stogov [Wed, 17 Mar 2021 13:55:42 +0000 (16:55 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80839 (PHP problem with JIT)
Dmitry Stogov [Wed, 17 Mar 2021 13:55:09 +0000 (16:55 +0300)]
Fixed bug #80839 (PHP problem with JIT)
Dmitry Stogov [Wed, 17 Mar 2021 12:50:36 +0000 (15:50 +0300)]
Fix CLANG/RELEASE build (this is a workaround for probable bug in CLANG)
Christoph M. Becker [Wed, 17 Mar 2021 11:40:40 +0000 (12:40 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #66783: UAF when appending DOMDocument to element
Christoph M. Becker [Wed, 17 Mar 2021 11:39:06 +0000 (12:39 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #66783: UAF when appending DOMDocument to element
Christoph M. Becker [Mon, 15 Mar 2021 09:26:50 +0000 (10:26 +0100)]
Fix #66783: UAF when appending DOMDocument to element
According to the DOM standard, elements may only contain element, text,
processing instruction and comment nodes[1]. It is also specified that
a HierarchyRequestError should be thrown if a document is to be
inserted[2]. We follow that standard, and prevent the use-after-free
this way.
[1] <https://dom.spec.whatwg.org/#node-trees>
[2] <https://dom.spec.whatwg.org/#mutation-algorithms>
Closes GH-6765.
Nikita Popov [Wed, 17 Mar 2021 11:19:09 +0000 (12:19 +0100)]
Avoid unnecessary static_variables persistence
static_variables should be treated the same way as all other
op_array components nowadays (only static_variables_ptr is
special). There's no need to persist/serialize it is separately
per shared op_array.
Christoph M. Becker [Wed, 17 Mar 2021 11:15:35 +0000 (12:15 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
8.0.5 is next
Christoph M. Becker [Wed, 17 Mar 2021 11:12:01 +0000 (12:12 +0100)]
8.0.5 is next
We also move the NEWS entry for bug 80847 to the proper version.
Nikita Popov [Wed, 17 Mar 2021 10:51:23 +0000 (11:51 +0100)]
Simplify attribute persistence
For an inherited op_array, directly fetch the xlat entry, as we
do for everything else.
Nikita Popov [Wed, 17 Mar 2021 10:26:41 +0000 (11:26 +0100)]
Fix PDO test under libmysqlclient
Máté Kocsis [Wed, 17 Mar 2021 08:39:54 +0000 (09:39 +0100)]
Declare PDORow::queryString property
Relates GH-6742
Dmitry Stogov [Wed, 17 Mar 2021 06:56:07 +0000 (09:56 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80847 (CData structs with fields of type struct can't be passed as C function argument)
Dmitry Stogov [Wed, 17 Mar 2021 06:55:20 +0000 (09:55 +0300)]
Fixed bug #80847 (CData structs with fields of type struct can't be passed as C function argument)
George Peter Banyard [Mon, 15 Mar 2021 16:26:04 +0000 (16:26 +0000)]
Add API to fetch bool value for PDO attribute values
Closes GH-6766
George Peter Banyard [Mon, 15 Mar 2021 15:30:58 +0000 (15:30 +0000)]
Use standard PDO way for fetching integer attribute values
George Peter Banyard [Fri, 12 Mar 2021 20:41:15 +0000 (20:41 +0000)]
Validate string is numeric for integer PDO attribute value
Máté Kocsis [Tue, 16 Mar 2021 16:24:30 +0000 (17:24 +0100)]
Promote DOM invalid state errors during property access
Closes GH-6780
Dmitry Stogov [Tue, 16 Mar 2021 17:31:36 +0000 (20:31 +0300)]
Change Zend Stream API to use zend_string* instead of char*.
This allows to eliminate re-calculation of string lenght and hash value.
See the detailed list of changes in UPGRADING.INTERNALS.
Ilija Tovilo [Tue, 5 Jan 2021 22:06:11 +0000 (23:06 +0100)]
Add tokenizer_data_gen to build process
Closes GH-6723.
Nikita Popov [Tue, 16 Mar 2021 13:30:24 +0000 (14:30 +0100)]
Don't check executability
As $(PHP) is not an absolute path, test -x doesn't do anything
meaningful. Rely on the autoconf check.
Nikita Popov [Tue, 16 Mar 2021 13:24:48 +0000 (14:24 +0100)]
Check for WRONG_PROPERTY_INFO
Nikita Popov [Tue, 16 Mar 2021 13:21:38 +0000 (14:21 +0100)]
Revert "Remove some unnecessary explicit header dependencies"
This reverts commit
c386b1fb177ec0dccc840cbec801e69609ced5c3 .
It looks like at least some of these might be needed for ordering
in a clean build?
Nikita Popov [Tue, 16 Mar 2021 12:08:37 +0000 (13:08 +0100)]
Automatically run zend_vm_gen.php if zend_vm_def.h changes
Nikita Popov [Tue, 16 Mar 2021 12:02:23 +0000 (13:02 +0100)]
Remove some unnecessary explicit header dependencies
These are now automatically tracked by the build system.
Nikita Popov [Tue, 16 Mar 2021 11:28:47 +0000 (12:28 +0100)]
Check for php program in autoconf
Use the detected PHP (minimum 7.1) to run gen_stubs, and other
code generation scripts in the future.
Max Semenik [Wed, 10 Feb 2021 12:17:03 +0000 (15:17 +0300)]
run-tests.php: class for test file loading
This moves a bunch of code outside of run_tests(), making it a bit
more manageable. Additionally, accessors provide better readability
than isset() and friends.
This is a minimal patch that moves the code but does not refactor
much. For the sake of reviewing experience, it does not involve
further refactoring which could include:
* Removing setSection()
* Fixing up the mess with hasSection() vs. sectionNotEmpty(), only
one of which is really needed.
* Moving more repetitive code into the new class.
All of this will be done with later commits.
Closes GH-6678.
Nikita Popov [Tue, 16 Mar 2021 10:18:12 +0000 (11:18 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix refcount inference for typed properties
Nikita Popov [Tue, 16 Mar 2021 10:15:48 +0000 (11:15 +0100)]
Fix refcount inference for typed properties
We were not adding RC1/RCN if the MAY_BE_OBJECT came from a class
type and there was no other refcounted type in the union.
Nikita Popov [Tue, 16 Mar 2021 09:38:04 +0000 (10:38 +0100)]
Add sanity check for type of read_property return value
If an internal class overrides read_property and declared property
types, make sure that the returned value matches the declared
type (in debug builds).
Derick Rethans [Tue, 16 Mar 2021 09:41:47 +0000 (09:41 +0000)]
Merge branch 'PHP-8.0'
Derick Rethans [Tue, 16 Mar 2021 09:41:40 +0000 (09:41 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Derick Rethans [Tue, 16 Mar 2021 09:41:21 +0000 (09:41 +0000)]
Fix build version too
Derick Rethans [Tue, 16 Mar 2021 09:40:32 +0000 (09:40 +0000)]
Merge branch 'PHP-8.0'
Derick Rethans [Tue, 16 Mar 2021 09:40:21 +0000 (09:40 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Derick Rethans [Tue, 16 Mar 2021 09:40:05 +0000 (09:40 +0000)]
NEWS for 7.4.18
Derick Rethans [Tue, 16 Mar 2021 09:33:33 +0000 (09:33 +0000)]
Prepare for 7.4.17RC1
Máté Kocsis [Tue, 16 Mar 2021 08:34:04 +0000 (09:34 +0100)]
Merge branch 'PHP-8.0'
* Fix crash in LDAP search functions during argument validation
* Fix ldap_next_entry() parameter name
Máté Kocsis [Mon, 15 Mar 2021 22:07:27 +0000 (23:07 +0100)]
Fix ldap_next_entry() parameter name
Máté Kocsis [Mon, 15 Mar 2021 22:07:05 +0000 (23:07 +0100)]
Fix crash in LDAP search functions during argument validation
Máté Kocsis [Mon, 15 Mar 2021 22:47:58 +0000 (23:47 +0100)]
Merge branch 'PHP-8.0'
Máté Kocsis [Mon, 15 Mar 2021 22:45:37 +0000 (23:45 +0100)]
Add missing skipif sections to ext/dom tests
Christoph M. Becker [Mon, 15 Mar 2021 17:40:30 +0000 (18:40 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
Christoph M. Becker [Mon, 15 Mar 2021 17:39:11 +0000 (18:39 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
Christoph M. Becker [Mon, 1 Mar 2021 17:14:26 +0000 (18:14 +0100)]
Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
We need to close persistent streams with the proper flag.
George Peter Banyard [Fri, 12 Mar 2021 21:02:15 +0000 (21:02 +0000)]
Add comment explaining empty default case
George Peter Banyard [Fri, 12 Mar 2021 20:24:31 +0000 (20:24 +0000)]
Boolify pdo_dbh_attribute_set()
George Peter Banyard [Fri, 12 Mar 2021 03:11:31 +0000 (03:11 +0000)]
Boolify pdo_hash_methods()
George Peter Banyard [Fri, 12 Mar 2021 03:05:04 +0000 (03:05 +0000)]
Boolify pdo_stmt_describe_columns()
George Peter Banyard [Fri, 12 Mar 2021 02:57:46 +0000 (02:57 +0000)]
Voidify internal pdo_sqlstate_init_error_table()
This always returned SUCCESS
George Peter Banyard [Fri, 12 Mar 2021 02:27:18 +0000 (02:27 +0000)]
Remove php_pdo_str_tolower_dup() function
Dharman [Wed, 20 Jan 2021 22:50:55 +0000 (22:50 +0000)]
Change the default error mode of mysqli
Make MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT the new mysqli
error reporting default. Explicitly call
mysqli_report(MYSQLI_REPORT_OFF) to preserve previous behavior.
RFC: https://wiki.php.net/rfc/mysqli_default_errmode
Closes GH-6629.
Nikita Popov [Mon, 15 Mar 2021 13:48:09 +0000 (14:48 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug #80866
Nikita Popov [Mon, 15 Mar 2021 13:47:50 +0000 (14:47 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #80866
Dharman [Mon, 15 Mar 2021 12:21:44 +0000 (12:21 +0000)]
Fix bug #80866
Closes GH-6774.
Nikita Popov [Mon, 15 Mar 2021 13:38:56 +0000 (14:38 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug #80837
Nikita Popov [Mon, 15 Mar 2021 13:38:22 +0000 (14:38 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #80837
Dharman [Fri, 5 Mar 2021 21:45:27 +0000 (21:45 +0000)]
Fix bug #80837
The error needs to be reported on the statement, not the connection.
Nikita Popov [Mon, 15 Mar 2021 13:22:49 +0000 (14:22 +0100)]
Assert that stmt is set in PDORow
Nikita Popov [Mon, 15 Mar 2021 13:12:49 +0000 (14:12 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Update ubuntu on i386 job
Downgrade security level in tests using TLS < 1.2
Nikita Popov [Mon, 15 Mar 2021 13:12:42 +0000 (14:12 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Update ubuntu on i386 job
Downgrade security level in tests using TLS < 1.2
Nikita Popov [Mon, 15 Mar 2021 11:11:51 +0000 (12:11 +0100)]
Update ubuntu on i386 job
There is a failure with apt on PHP-7.4 that's not present on
PHP-8.0/master. Switching to a newer ubuntu version on PHP-7.4
avoids the issue.
Nikita Popov [Thu, 18 Jun 2020 13:08:24 +0000 (15:08 +0200)]
Downgrade security level in tests using TLS < 1.2
A few additional tests have been added on master that require
lower security level.
(cherry picked from commit
c2a6395dcbab20549702e56006f7cd389cefebcd )
Máté Kocsis [Mon, 15 Mar 2021 12:11:57 +0000 (13:11 +0100)]
Use typed properties in ext/mysqli
Closes GH-6739
Nikita Popov [Mon, 15 Mar 2021 12:01:42 +0000 (13:01 +0100)]
Use zend_objects_not_comparable in PDO
Dharman [Fri, 5 Mar 2021 22:26:55 +0000 (22:26 +0000)]
Add CLEAN sections to mysqli and PDO mysql tests
Closes GH-6756.
Nikita Popov [Mon, 15 Mar 2021 09:53:08 +0000 (10:53 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
ext/opcache: fix configure output while checking mmap MAP_ANON support
Michael Heimpold [Sun, 7 Mar 2021 09:00:43 +0000 (10:00 +0100)]
ext/opcache: fix configure output while checking mmap MAP_ANON support
It seems that
f3efb9e3fb introduced a "typo" which may result
in the following confusing message:
checking for mmap() using MAP_ANON shared memory support... no=yes
Let's fix this.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Closes GH-6758.
Dharman [Sat, 13 Mar 2021 19:06:17 +0000 (19:06 +0000)]
Deprecate mysqli driver_version property
The driver version hasn't been updated in 13 years, so this number
is essentially meaningless. Check PHP_VERSION_ID instead.
Nikita Popov [Mon, 15 Mar 2021 09:40:48 +0000 (10:40 +0100)]
Remove dead mysqli_driver_construct() function
This function was never registered with PHP, and the body is
commented out.
Dharman [Sat, 13 Mar 2021 18:17:56 +0000 (18:17 +0000)]
Clean up mysqli_driver test cases
And remove an unnecessary test case that is already covered by the
other two.
Dharman [Sat, 13 Mar 2021 17:56:42 +0000 (17:56 +0000)]
Remove redundant macros in mysqli_driver implementation
This class doesn't define many properties, and the macros make
customization hard.
Dharman [Sat, 13 Mar 2021 19:42:38 +0000 (19:42 +0000)]
Remove unused mysqli global
And fix formatting issues.
Dharman [Fri, 12 Mar 2021 22:02:36 +0000 (22:02 +0000)]
client_info is a constant and doesn't need a connection
Closes GH-6767.
George Peter Banyard [Sun, 14 Mar 2021 15:05:54 +0000 (15:05 +0000)]
Use zend_string* & more legible API for php_get_display_errors_mode()
Calison [Sun, 7 Mar 2021 19:21:13 +0000 (16:21 -0300)]
Return early on php display error for better legibility
Closes GH-6760
Signed-off-by: George Peter Banyard <girgias@php.net>
Anatol Belski [Sat, 13 Mar 2021 20:34:19 +0000 (21:34 +0100)]
hash: xxhash: Use canonicalization routine from existing API
Signed-off-by: Anatol Belski <ab@php.net>
Dmitry Stogov [Fri, 12 Mar 2021 22:04:43 +0000 (01:04 +0300)]
Remove deprecated code
Dmitry Stogov [Fri, 12 Mar 2021 18:50:26 +0000 (21:50 +0300)]
Fixed compilation warning
Dmitry Stogov [Thu, 11 Mar 2021 19:33:01 +0000 (22:33 +0300)]
Inline "array" part of FE_FETCH_R handler into HYBRID VM
Dmitry Stogov [Thu, 11 Mar 2021 12:57:02 +0000 (15:57 +0300)]
zend_verify_recv_arg_type_helper is not "cold".
Dmitry Stogov [Thu, 11 Mar 2021 11:27:53 +0000 (14:27 +0300)]
Avoid repeatable work when error_reporting() is called with the same argument few times.
Dmitry Stogov [Thu, 11 Mar 2021 10:42:35 +0000 (13:42 +0300)]
Inheritance cache optimization
Dmitry Stogov [Wed, 10 Mar 2021 14:39:26 +0000 (17:39 +0300)]
Fixed assertion (ext/opcache/zend_persist.c:327: zend_accel_get_type_map_ptr: Assertion `ret > 2' failed)
Dmitry Stogov [Wed, 10 Mar 2021 13:04:33 +0000 (16:04 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80814 (threaded mod_php won't load on FreeBSD: No space available for static Thread Local Storage)
Dmitry Stogov [Wed, 10 Mar 2021 13:03:47 +0000 (16:03 +0300)]
Fixed bug #80814 (threaded mod_php won't load on FreeBSD: No space available for static Thread Local Storage)
Dmitry Stogov [Tue, 9 Mar 2021 14:37:24 +0000 (17:37 +0300)]
Use spl_filesystem_object.file_name for SPL_FS_DIR as a cache and prevent multiple file name reconstruction.
Christoph M. Becker [Mon, 8 Mar 2021 14:16:55 +0000 (15:16 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #51903: simplexml_load_file() doesn't use HTTP headers
Christoph M. Becker [Mon, 8 Mar 2021 14:08:11 +0000 (15:08 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #51903: simplexml_load_file() doesn't use HTTP headers
Christoph M. Becker [Wed, 3 Mar 2021 18:23:39 +0000 (19:23 +0100)]
Fix #51903: simplexml_load_file() doesn't use HTTP headers
The `encoding` attribute of the XML declaration is optional; it is good
practice to use external encoding information where available if it is
missing. Thus, we check for `charset` info of `Content-Type` headers,
and see whether the encoding is supported.
We cater to trailing parameters and quoted-strings, but not to escaped
backslashes and quotes in quoted-strings, since no known character
encoding contains these anyway.
Co-authored-by: Michael Wallner <mike@php.net>
Closes GH-6747.
Christoph M. Becker [Mon, 8 Mar 2021 13:52:45 +0000 (14:52 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #80838: HTTP wrapper waits for HTTP 1 response after HTTP 101
Christoph M. Becker [Mon, 8 Mar 2021 13:39:38 +0000 (14:39 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80838: HTTP wrapper waits for HTTP 1 response after HTTP 101