]>
granicus.if.org Git - php/log
Dmitry Stogov [Wed, 30 Sep 2020 05:29:37 +0000 (08:29 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect logical condition
Dmitry Stogov [Wed, 30 Sep 2020 05:29:21 +0000 (08:29 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed incorrect logical condition
George Peter Banyard [Wed, 30 Sep 2020 05:29:00 +0000 (08:29 +0300)]
Fixed incorrect logical condition
Dmitry Stogov [Wed, 30 Sep 2020 05:22:35 +0000 (08:22 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect logical conditions
George Peter Banyard [Wed, 30 Sep 2020 05:21:46 +0000 (08:21 +0300)]
Fixed incorrect logical conditions
George Peter Banyard [Wed, 30 Sep 2020 05:15:04 +0000 (08:15 +0300)]
Removed duplicate conditions
Christoph M. Becker [Tue, 29 Sep 2020 21:13:43 +0000 (23:13 +0200)]
Revert "Use external iterator instead of via the internal pointer"
This reverts commit
a6ecafece90909d74a578e09f626e875d3035eab .
Closes GH-6242.
Gabriel Caruso [Tue, 29 Sep 2020 22:43:11 +0000 (22:43 +0000)]
Update NEWS for 8.0.0rc2
Gabriel Caruso [Tue, 29 Sep 2020 22:32:14 +0000 (22:32 +0000)]
Update NEWS for PHP 8.0.0rc1
Gabriel Caruso [Tue, 29 Sep 2020 22:19:10 +0000 (00:19 +0200)]
Prepare for PHP 8.0 RC1
Stanislav Malyshev [Tue, 29 Sep 2020 17:14:40 +0000 (10:14 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Add 7.4.11 security fixes to NEWS
[ci skip] Add 7.3.23 security fixes to NEWS
Stanislav Malyshev [Tue, 29 Sep 2020 17:13:38 +0000 (10:13 -0700)]
[ci skip] Add 7.4.11 security fixes to NEWS
Stanislav Malyshev [Tue, 29 Sep 2020 17:11:52 +0000 (10:11 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
[ci skip] Add 7.3.23 security fixes to NEWS
Stanislav Malyshev [Tue, 29 Sep 2020 17:09:33 +0000 (10:09 -0700)]
[ci skip] Add 7.3.23 security fixes to NEWS
Christoph M. Becker [Tue, 29 Sep 2020 16:44:23 +0000 (18:44 +0200)]
Fix recently introduced off-by-one error
Nikita Popov [Tue, 29 Sep 2020 14:29:15 +0000 (16:29 +0200)]
Update iconv parameter names
And rename charset to encoding, including inside error messages.
Closes GH-6234.
Dik Takken [Tue, 29 Sep 2020 14:00:32 +0000 (16:00 +0200)]
Warning promotion: Throw on writing invalid XML tag names
This change throws a ValueError when an invalid tag name is passed
to XMLWriter.
The rationale is that this indicates a programming error because
tag names typically originate from string literals or application
code generating them. This translates into either a typo or a flaw
in tag generation logic.
Closes GH-6233.
Nikita Popov [Fri, 25 Sep 2020 10:29:21 +0000 (12:29 +0200)]
Update ext/standard parameter names
Closes GH-6214.
Côme Chilliet [Tue, 29 Sep 2020 07:36:25 +0000 (09:36 +0200)]
Improve parameter names in ext/ldap
Merging PR 6153
MCMic [Mon, 28 Sep 2020 14:32:57 +0000 (16:32 +0200)]
Harmonize ldap_rename_ext with ldap_rename parameter names
Co-authored-by: Nikita Popov <nikita.ppv@googlemail.com>
Côme Chilliet [Mon, 28 Sep 2020 12:52:40 +0000 (14:52 +0200)]
Rename $link parameters to $ldap in ldap functions
Also fixed ldap_set_option places where $newvalue was still used
MCMic [Mon, 28 Sep 2020 12:20:48 +0000 (14:20 +0200)]
Improve parameter naming in ldap_rename
Co-authored-by: Nikita Popov <nikita.ppv@googlemail.com>
MCMic [Mon, 28 Sep 2020 12:20:28 +0000 (14:20 +0200)]
Improve parameter naming in ldap_exop_passwd
Co-authored-by: Nikita Popov <nikita.ppv@googlemail.com>
MCMic [Mon, 28 Sep 2020 12:19:43 +0000 (14:19 +0200)]
Improve parameter naming in ldap_connect
Co-authored-by: Nikita Popov <nikita.ppv@googlemail.com>
MCMic [Mon, 28 Sep 2020 12:18:43 +0000 (14:18 +0200)]
Improve parameter naming in ldap_set_option ext/ldap/ldap.stub.php
Co-authored-by: Nikita Popov <nikita.ppv@googlemail.com>
Côme Chilliet [Mon, 21 Sep 2020 12:50:15 +0000 (14:50 +0200)]
Explicitely mark nullable strings
MCMic [Thu, 17 Sep 2020 16:14:23 +0000 (18:14 +0200)]
Fix parameter mask in ldap_next_attribute
Co-authored-by: Nikita Popov <nikita.ppv@googlemail.com>
Côme Chilliet [Thu, 17 Sep 2020 15:13:48 +0000 (17:13 +0200)]
Fix parameter names in ext/ldap
Renamed all parameters to be consistent and concise
Côme Chilliet [Thu, 17 Sep 2020 15:03:23 +0000 (17:03 +0200)]
Fix "null" case in ldap.stub.php
Côme Chilliet [Thu, 17 Sep 2020 14:53:50 +0000 (16:53 +0200)]
Remove dummy_ber parameter from ldap_first_attribute and ldap_next_attribute
It has been unused and deprecated since PHP 5.2.4
Côme Chilliet [Thu, 17 Sep 2020 14:47:12 +0000 (16:47 +0200)]
Set all parameters to ldap_sasl_bind as NULL by default
For mech, realm, authcid, authzid and props NULL means do not change
current server setting.
Côme Chilliet [Thu, 17 Sep 2020 14:42:17 +0000 (16:42 +0200)]
Default bind dn and password to NULL in ldap_bind_ext
Côme Chilliet [Thu, 17 Sep 2020 14:40:04 +0000 (16:40 +0200)]
Default bind dn and password to NULL in ldap_bind
Côme Chilliet [Thu, 17 Sep 2020 14:03:43 +0000 (16:03 +0200)]
Make URI parameter in ldap_connect default to NULL
Remi Collet [Tue, 29 Sep 2020 14:17:23 +0000 (16:17 +0200)]
bump zip extension version
George Peter Banyard [Mon, 28 Sep 2020 17:31:02 +0000 (18:31 +0100)]
Promote E_NOTICE to Value/TypeError in PostgreSQL extension
Add some tests to cover related codepaths.
With the small caveat that the ones in build_assignment_string()
still don't seem to be tested as it looks the condtions are checked
beforehand, might need some more investigation.
Closes GH-6226
Nikita Popov [Tue, 29 Sep 2020 13:21:32 +0000 (15:21 +0200)]
Update ext/tokenizer param names
Closes GH-6232.
Dmitry Stogov [Tue, 29 Sep 2020 13:33:32 +0000 (16:33 +0300)]
Allow tracing JIT cooperate with function JIT.
Dik Takken [Fri, 25 Sep 2020 13:54:28 +0000 (15:54 +0200)]
Make handling of NULL bytes in file paths more consistent (WIP)
Not all extensions consistently throw exceptions when the user passes
a path name containing null bytes. Also, some extensions would throw
a ValueError while others would throw a TypeError. Error messages
also varied.
Now a ValueError is thrown after all failed path checks, at least for
as far as these occur in functions that are exposed to userland.
Closes GH-6216.
Nikita Popov [Tue, 29 Sep 2020 12:48:31 +0000 (14:48 +0200)]
Don't accept dir handle in Directory methods
This is an artifact of the shared implementation with readdir() etc.
The method versions should not accept an explicit dir handle, as
they work on the dir handle from the object.
Dmitry Stogov [Tue, 29 Sep 2020 12:07:45 +0000 (15:07 +0300)]
Tracing JIT support for preloaded scripts
Nikita Popov [Tue, 29 Sep 2020 10:35:39 +0000 (12:35 +0200)]
Remove unused variable
Nikita Popov [Thu, 24 Sep 2020 13:28:36 +0000 (15:28 +0200)]
Update gmp+bcmath parameter names
Closes GH-6205.
Christoph M. Becker [Tue, 29 Sep 2020 10:16:30 +0000 (12:16 +0200)]
Merge branch 'PHP-7.4' into master
* PHP-7.4:
[ci skip] Fix version
Christoph M. Becker [Tue, 29 Sep 2020 10:11:48 +0000 (12:11 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
[ci skip] Fix version
Christoph M. Becker [Tue, 29 Sep 2020 10:10:36 +0000 (12:10 +0200)]
[ci skip] Fix version
Dmitry Stogov [Tue, 29 Sep 2020 10:05:24 +0000 (13:05 +0300)]
Keep track information about used JIT trigger in ZEND_FUNC_INFO(op_array)->func_info.flags
Christoph M. Becker [Tue, 29 Sep 2020 09:41:17 +0000 (11:41 +0200)]
Use external iterator instead of via the internal pointer
Christoph M. Becker [Tue, 29 Sep 2020 09:36:54 +0000 (11:36 +0200)]
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #80152: odbc_execute() moves internal pointer of $params
Christoph M. Becker [Tue, 29 Sep 2020 09:35:28 +0000 (11:35 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #80152: odbc_execute() moves internal pointer of $params
Christoph M. Becker [Sat, 26 Sep 2020 11:14:40 +0000 (13:14 +0200)]
Fix #80152: odbc_execute() moves internal pointer of $params
As least intrusive fix, we separate the passed array argument.
Closes GH-6219.
Christoph M. Becker [Wed, 23 Sep 2020 21:52:27 +0000 (23:52 +0200)]
Fix #78792: zlib.output_compression disabled by Content-Type: image/
Disabling output compression for images has served to fix bug #16109,
where zlib compressed images apparently have caused issues with
Navigator 4. This shouldn't be an issue with somewhat contemporary
browsers. Other than that, this is an arbitrary restriction – why
don't we disable the compression for some other media types as well
(e.g. video/* and audio/*)? All in all, we should leave that decision
to userland.
Closes GH-6198.
Christoph M. Becker [Sun, 27 Sep 2020 21:11:56 +0000 (23:11 +0200)]
Fix #22986: odbc_connect() may reuse persistent connection
`odbc_connect()` should not reuse persistent connections, since that
prohibits multiple concurrent connections, which are occasionally
desireable. We fix that by no longer looking for already cached
connections when `odbc_connect()` is called, and instead creating a new
connection instead.
Closes GH-6223.
Dmitry Stogov [Tue, 29 Sep 2020 09:13:17 +0000 (12:13 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed unintended disabling of Optimizer for preloaded scripts introduced by
4a2646cf459
Dmitry Stogov [Tue, 29 Sep 2020 09:11:01 +0000 (12:11 +0300)]
Fixed unintended disabling of Optimizer for preloaded scripts introduced by
4a2646cf459
Christoph M. Becker [Tue, 29 Sep 2020 09:05:31 +0000 (11:05 +0200)]
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #80150: Failure to fetch error message
Máté Kocsis [Tue, 29 Sep 2020 07:19:45 +0000 (09:19 +0200)]
Make the $filter parameter of ReflectionClass::get*Constants() nullable
Máté Kocsis [Mon, 28 Sep 2020 21:02:42 +0000 (23:02 +0200)]
Reflection param renames amendment
Closes GH-6230
Christoph M. Becker [Tue, 29 Sep 2020 09:03:52 +0000 (11:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #80150: Failure to fetch error message
Máté Kocsis [Mon, 28 Sep 2020 20:48:34 +0000 (22:48 +0200)]
Rename a few parameters in ext/filter
Closes GH-6229
Máté Kocsis [Mon, 28 Sep 2020 20:19:20 +0000 (22:19 +0200)]
Zend parameter renames amendment
Closes GH-6228
Christoph M. Becker [Fri, 25 Sep 2020 15:27:41 +0000 (17:27 +0200)]
Fix #80150: Failure to fetch error message
In case of statement related errors, we need to pass the respective
statement handle to `SQLError()`.
Closes GH-6217.
Nikita Popov [Tue, 29 Sep 2020 08:59:46 +0000 (10:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #80137
Fix bug #80138
Nikita Popov [Tue, 29 Sep 2020 08:59:32 +0000 (10:59 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #80137
Fix bug #80138
Matthias Karbe [Wed, 23 Sep 2020 12:54:25 +0000 (14:54 +0200)]
Fix bug #80137
Skip getprotobyname() and getprotobynumber() tests on *nix if there
is no /etc/protocols file.
Closes GH-6193.
Matthias Karbe [Wed, 23 Sep 2020 12:25:30 +0000 (14:25 +0200)]
Fix bug #80138
Skip getservbyname() and getservbyport() tests on *nix if there is
no /etc/services file.
Closes GH-6191.
Nikita Popov [Tue, 29 Sep 2020 08:48:12 +0000 (10:48 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Synchronize php.ini-development and php.ini-production
Giovanni Giacobbi [Mon, 28 Sep 2020 22:43:23 +0000 (00:43 +0200)]
Synchronize php.ini-development and php.ini-production
Closes GH-6231.
zeriyoshi [Fri, 25 Sep 2020 21:58:03 +0000 (06:58 +0900)]
Add call_user_func_array() backward incompatible change
Closes GH-6218.
[ci skip]
Remi Collet [Tue, 29 Sep 2020 06:52:09 +0000 (08:52 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] typo
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
Remi Collet [Tue, 29 Sep 2020 06:51:03 +0000 (08:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
[ci skip] typo
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
Remi Collet [Tue, 29 Sep 2020 06:50:14 +0000 (08:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] typo
Update NEWS & UPGRADING
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
Remi Collet [Tue, 29 Sep 2020 06:49:56 +0000 (08:49 +0200)]
[ci skip] typo
Stanislav Malyshev [Tue, 29 Sep 2020 05:55:37 +0000 (22:55 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update UPGRADING
Update UPGRADING
Update NEWS & UPGRADING
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
Stanislav Malyshev [Tue, 29 Sep 2020 04:42:19 +0000 (21:42 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update UPGRADING
Update NEWS & UPGRADING
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
Stanislav Malyshev [Mon, 21 Sep 2020 01:08:55 +0000 (18:08 -0700)]
Do not decode cookie names anymore
Stanislav Malyshev [Sun, 27 Sep 2020 05:08:52 +0000 (22:08 -0700)]
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
Stanislav Malyshev [Tue, 29 Sep 2020 04:39:34 +0000 (21:39 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS & UPGRADING
Do not decode cookie names anymore
Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
Stanislav Malyshev [Tue, 29 Sep 2020 04:39:20 +0000 (21:39 -0700)]
Update UPGRADING
Stanislav Malyshev [Tue, 29 Sep 2020 04:38:58 +0000 (21:38 -0700)]
Update UPGRADING
Stanislav Malyshev [Tue, 29 Sep 2020 04:34:52 +0000 (21:34 -0700)]
Update NEWS & UPGRADING
Larry Garfield [Sat, 26 Sep 2020 15:41:20 +0000 (10:41 -0500)]
Update PDO parameters for named arguments.
Closes GH-6220
Christoph M. Becker [Mon, 28 Sep 2020 20:59:51 +0000 (22:59 +0200)]
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #67465: NULL Pointer dereference in odbc_handle_preparer
Christoph M. Becker [Mon, 28 Sep 2020 20:57:59 +0000 (22:57 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #67465: NULL Pointer dereference in odbc_handle_preparer
Christoph M. Becker [Mon, 28 Sep 2020 15:05:17 +0000 (17:05 +0200)]
Fix #67465: NULL Pointer dereference in odbc_handle_preparer
We have to initialize `stmt->driver_data` before we use it.
Closes GH-6225.
Dmitry Stogov [Mon, 28 Sep 2020 20:54:28 +0000 (23:54 +0300)]
Move invariant type guard out of loop
George Peter Banyard [Mon, 28 Sep 2020 18:35:31 +0000 (19:35 +0100)]
Another pass making some failure states unconditional erros in PDO
Also make internal function return type more accurate to inform usage
George Peter Banyard [Thu, 24 Sep 2020 23:41:21 +0000 (00:41 +0100)]
Make various failure conditions in PDO unconditional errors
This includes TypeErrors, ValueErrors, Error for uninitialized objects
and invalid user classes/callable instanciation
Closes GH-6212
George Peter Banyard [Mon, 28 Sep 2020 16:44:13 +0000 (17:44 +0100)]
Do not register quoter handler in ODBC
This functionallity is not (yet) implemented and therefore gives a bogus error while using PDO
George Peter Banyard [Fri, 25 Sep 2020 01:43:44 +0000 (02:43 +0100)]
Drop ZPP check in PDO MySQLi test
This test is marked as XFAIL so it doesn't get looked at.
It checks that the method is called without arguments which is a ZPP concern
Dmitry Stogov [Mon, 28 Sep 2020 17:29:46 +0000 (20:29 +0300)]
Dump class names
George Peter Banyard [Mon, 28 Sep 2020 14:14:44 +0000 (15:14 +0100)]
Promote notice to ValueError for invalid hint key
Dmitry Stogov [Mon, 28 Sep 2020 14:04:34 +0000 (17:04 +0300)]
Improved trace selection rules
Nikita Popov [Mon, 28 Sep 2020 13:55:22 +0000 (15:55 +0200)]
Promote warnings in ext/xsl
Nikita Popov [Mon, 28 Sep 2020 13:41:31 +0000 (15:41 +0200)]
Remove unused XSL_DOMOBJ_NEW() macro
And inline the XSL_REGISTER_CLASS() macro.
Dmitry Stogov [Mon, 28 Sep 2020 13:18:06 +0000 (16:18 +0300)]
Fixed usage of invalid frame for exit point
Nikita Popov [Mon, 28 Sep 2020 11:11:07 +0000 (13:11 +0200)]
Consistently handle out of bounds offsets in iconv_strpos()
Same as in all other strpos() style functions, throw ValueError on
out of bounds offset.
George Peter Banyard [Thu, 24 Sep 2020 12:28:56 +0000 (13:28 +0100)]
Extensions should have the final say on their compiler flags
Currently compiler flags passed by extensions using the standard
``PHP_NEW_EXTENSION`` and ``PHP_ADD_SOURCES`` m4 macros are prepended
before the ones defined by ``Zend/Zend.m4``.
This was not really an issue before as ``Zend.m4`` only included
``-Wall`` but since the addition of ``-Wextra`` various issue about
disabling flags have been brought up.
A preliminary attempt was done in commit
5c1cf7669b937dcb4589cb0c8deccd343dfd85f9
but this turns out to be more or less irrelevant.
The root issue is that ``PHP_NEW_EXTENSION`` and ``PHP_ADD_SOURCES`` call the
``PHP_ADD_SOURCES_X`` macro and pass their flags as the 3rd argument which prepends
the flags. There exists a 6th argument for this macro which appends them but from a
cursory look at https://heap.space/search?full=PHP_ADD_SOURCES_X&project=php-src
this is not used. Moreover, the comment describing this macro explicitly informs
that this macro should not be used directly.
As such we drop the 6th argument of ``PHP_ADD_SOURCES_X`` and move the `special-flags`
argument to be appended instead of prepended.
Closes GH-6204
Nikita Popov [Mon, 28 Sep 2020 12:15:04 +0000 (14:15 +0200)]
Simplify iconv_strpos implementation
Use a separate "reverse" flag to determine search direction,
using offset == -1 to indicate this is is confusing. I initially
thought the code was trying to handle negative offsets.
Also deduplicate the forward and reverse cases, they really only differ
in one place.
Dmitry Stogov [Mon, 28 Sep 2020 11:47:45 +0000 (14:47 +0300)]
Missed opline guard