]>
granicus.if.org Git - php/log
Nikita Popov [Tue, 28 Jan 2020 16:17:07 +0000 (17:17 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix mysqli_get_warnings() with multi queries
Nikita Popov [Tue, 28 Jan 2020 16:12:45 +0000 (17:12 +0100)]
Fix mysqli_get_warnings() with multi queries
In this case warning_count may be non-zero, but php_get_warnings()
may still return no warnings. In this case we should return false
rather than returning a corrupted mysqli_warning object.
Christoph M. Becker [Tue, 28 Jan 2020 14:37:51 +0000 (15:37 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79174: cookie values with spaces fail to round-trip
Christoph M. Becker [Tue, 28 Jan 2020 14:11:59 +0000 (15:11 +0100)]
Fix #79174: cookie values with spaces fail to round-trip
The fix for bug #78929 disabled the conversion of spaces in cookie
values to plus signs, but failed to adapt `php_setcookie()`
accordingly, so that it uses raw URL encoding as well.
Nikita Popov [Tue, 28 Jan 2020 14:33:33 +0000 (15:33 +0100)]
Avoid shift UB for large arrays
Don't shift into the sign bit.
Nikita Popov [Tue, 28 Jan 2020 14:12:24 +0000 (15:12 +0100)]
Only fetch to_encoding once in mb_convert_encoding()
Instead of doing it on every conversion. This is both more efficient
and avoids generating multiple warnings.
Nikita Popov [Tue, 28 Jan 2020 13:42:19 +0000 (14:42 +0100)]
Make BG(syslog_device) per request
This is not supposed to be retained across requests. Explicitly
free it at the end of a request, and use the per-request allocator.
Christoph M. Becker [Tue, 28 Jan 2020 12:35:20 +0000 (13:35 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable support for LIBZIP_VERSION
Christoph M. Becker [Tue, 28 Jan 2020 12:30:53 +0000 (13:30 +0100)]
Enable support for LIBZIP_VERSION
This is already supported by non Windows builds for libzip >= 1.3.1,
and since we're using at least libzip 1.4.0 on Windows, we should
support it there as well.
Nikita Popov [Tue, 28 Jan 2020 12:11:49 +0000 (13:11 +0100)]
Fix rel_date leak on DateInterval construction failure
Nikita Popov [Tue, 28 Jan 2020 11:33:58 +0000 (12:33 +0100)]
Throw an exception if default_dir not set, but required
Previously the RETURN_THROWS() assertion failed for this case.
Remi Collet [Tue, 28 Jan 2020 10:32:42 +0000 (11:32 +0100)]
zip: fix lib check
Nikita Popov [Tue, 28 Jan 2020 10:23:16 +0000 (11:23 +0100)]
Perform map ptr base arithmetic through uintptr_t
Adding an offset to the NULL pointer is undefined behavior.
Avoid this by performing arithmetic on uintptr_t instead.
Nikita Popov [Tue, 28 Jan 2020 10:16:53 +0000 (11:16 +0100)]
Don't index NULL pointer when fetching non-existent constant
Remi Collet [Tue, 28 Jan 2020 09:52:09 +0000 (10:52 +0100)]
- bump zip extension version to 1.16.0 - add ZipArchive::setMtimeName and ZipArchive::setMtimeIndex methods
Nikita Popov [Tue, 28 Jan 2020 09:44:37 +0000 (10:44 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78989
Nikita Popov [Tue, 28 Jan 2020 09:41:11 +0000 (10:41 +0100)]
Fixed bug #78989
Always operate on copies of the functions, so we don't reference
temporary trait methods that have gone out of scope.
This could be more efficient, but doing an allocated copy only when
strictly necessary turned out to be somewhat tricky.
Christoph M. Becker [Tue, 28 Jan 2020 09:40:00 +0000 (10:40 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #76584: PharFileInfo::decompress not working
Christoph M. Becker [Tue, 28 Jan 2020 09:32:26 +0000 (10:32 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #76584: PharFileInfo::decompress not working
Christoph M. Becker [Sun, 26 Jan 2020 12:33:07 +0000 (13:33 +0100)]
Fix #76584: PharFileInfo::decompress not working
We actually have to decompress, when told to do so.
Christoph M. Becker [Tue, 28 Jan 2020 08:19:45 +0000 (09:19 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79172: STRUCT_OFFSET() relies on undefined behavior
Christoph M. Becker [Tue, 28 Jan 2020 08:15:23 +0000 (09:15 +0100)]
Fix #79172: STRUCT_OFFSET() relies on undefined behavior
Since this pattern is understood by compilers, not a real issue, but
certainly cleaner this way.
Tyson Andre [Sun, 26 Jan 2020 18:05:34 +0000 (13:05 -0500)]
Convert ZEND_ECHO operand to string after sccp
And filter out echoes of the empty string (e.g. false/null)
Split out of #5097 (on GitHub)
Closes GH-5118
George Peter Banyard [Wed, 11 Dec 2019 20:57:57 +0000 (21:57 +0100)]
Convert some warnings into ValueErrors in the standard file extension
Closes GH-5007
Remi Collet [Mon, 27 Jan 2020 15:48:54 +0000 (16:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
- bump zip extension version to 1.15.6 - add ZipArchive::LIBZIP_VERSION - skip bug53885.phpt with libzip 1.6.0 (empty file is no more valid archive)
Remi Collet [Mon, 27 Jan 2020 15:47:28 +0000 (16:47 +0100)]
- bump zip extension version to 1.15.6
- add ZipArchive::LIBZIP_VERSION
- skip bug53885.phpt with libzip 1.6.0 (empty file is no more valid archive)
Nikita Popov [Mon, 27 Jan 2020 15:13:36 +0000 (16:13 +0100)]
Remove state pointer argument from php_strip_tags
Máté Kocsis [Mon, 27 Jan 2020 13:04:19 +0000 (14:04 +0100)]
Merge branch 'PHP-7.4'
Máté Kocsis [Wed, 22 Jan 2020 12:33:11 +0000 (13:33 +0100)]
Fix #78969 Make PASSWORD_DEFAULT match PASSWORD_BCRYPT instead of being null
It was an unintentional BC break.
Nikita Popov [Mon, 27 Jan 2020 12:32:51 +0000 (13:32 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78323: Code 0 is returned on invalid options
Nikita Popov [Mon, 27 Jan 2020 12:32:29 +0000 (13:32 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #78323: Code 0 is returned on invalid options
Ivan Mikheykin [Fri, 17 Jan 2020 19:26:35 +0000 (22:26 +0300)]
Fix bug #78323: Code 0 is returned on invalid options
Set CLI exit code to 1 when invalid parameters are passed,
and print error to stderr.
Tyson Andre [Sun, 26 Jan 2020 16:53:42 +0000 (11:53 -0500)]
[skip ci] Fix typos in NEWS
Markus Staab [Sat, 25 Jan 2020 11:40:22 +0000 (12:40 +0100)]
Fix typo [ci skip]
Christoph M. Becker [Sun, 26 Jan 2020 13:14:52 +0000 (14:14 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0
Christoph M. Becker [Sun, 26 Jan 2020 13:13:52 +0000 (14:13 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0
Florian Smeets [Sun, 26 Jan 2020 04:18:57 +0000 (05:18 +0100)]
Add CURLOPT CURLOPT_HTTP09_ALLOWED available since 7.64.0
Anatol Belski [Sat, 25 Jan 2020 16:44:18 +0000 (17:44 +0100)]
Fix bundled PCRE2 compilation on ARM64
Anatol Belski [Tue, 21 Jan 2020 19:22:40 +0000 (20:22 +0100)]
Upgrade bundled PCRE2 to 10.34
George Peter Banyard [Sat, 25 Jan 2020 12:31:43 +0000 (13:31 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79080 [ci skip]
George Peter Banyard [Sat, 25 Jan 2020 12:31:10 +0000 (13:31 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79080 [ci skip]
George Peter Banyard [Sat, 25 Jan 2020 12:23:51 +0000 (13:23 +0100)]
Fixed bug #79080 [ci skip]
Rewrote session.gc_probability and session.gc_divisor INI setting
description to be more succint.
George Peter Banyard [Sat, 25 Jan 2020 11:32:55 +0000 (12:32 +0100)]
Add mention about empty needles for strrch() functions in UPGRADING [ci skip]
George Peter Banyard [Sat, 25 Jan 2020 11:22:01 +0000 (12:22 +0100)]
Allow empty needle in mb_strrchr()
George Peter Banyard [Tue, 7 Jan 2020 23:11:37 +0000 (00:11 +0100)]
Convert warnings to ValueError in mb_strpos function family.
Closes GH-5109
Nikita Popov [Fri, 24 Jan 2020 15:20:30 +0000 (16:20 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79128
Nikita Popov [Fri, 24 Jan 2020 15:18:28 +0000 (16:18 +0100)]
Fixed bug #79128
We need to extend the hash table before performing raw append
operations.
This doesn't matter if preloading happens in the same process,
as the tables will be large enough to hold all entries as a
side-effect of the preloading process. However, if preloading
happens in a different process, we need to reserve space here.
wbender [Fri, 3 Jan 2020 15:29:12 +0000 (09:29 -0600)]
Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree
If CONTEXT_DOCUMENT_ROOT is set use that rather than DOCUMENT_ROOT to
scan up the dir tree looking for .user.ini files.
Closes GH-5051.
Nikita Popov [Fri, 24 Jan 2020 14:15:36 +0000 (15:15 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix mysqli ssl test for tls1.3
Nikita Popov [Fri, 24 Jan 2020 14:14:52 +0000 (15:14 +0100)]
Fix mysqli ssl test for tls1.3
Specifying AES256-SHA results in TLS_AES_256_GCM_SHA384 if the
connection uses TLS v1.3.
Nikita Popov [Fri, 24 Jan 2020 13:55:00 +0000 (14:55 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79011
Fix memory leaks in mysqlnd debug functionality
Nikita Popov [Fri, 24 Jan 2020 13:52:28 +0000 (14:52 +0100)]
Fixed bug #79011
auth_plugin_data_len here is 21, including the trailing null byte.
Directly use SCRAMBLE_LENGTH instead. Also add a sanity check that
the provided scramble is long enough.
Nikita Popov [Fri, 24 Jan 2020 12:12:11 +0000 (13:12 +0100)]
Fix memory leaks in mysqlnd debug functionality
Christoph M. Becker [Fri, 24 Jan 2020 13:20:59 +0000 (14:20 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Make test independent of online XSD schema
Yet another check for php_strip_tags_ex()
Christoph M. Becker [Fri, 24 Jan 2020 13:19:17 +0000 (14:19 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Make test independent of online XSD schema
Yet another check for php_strip_tags_ex()
Christoph M. Becker [Fri, 24 Jan 2020 09:18:01 +0000 (10:18 +0100)]
Make test independent of online XSD schema
The test still needs to access <http://www.w3.org/2009/01/xml.xsd>, but
at least we no longer depend on <http://x-road.eu/xsd/x-road.xsd>,
which may be moved again.
Remi Collet [Fri, 24 Jan 2020 13:06:38 +0000 (14:06 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add ZipArchive::CM_LZMA2 constant (since libzip 1.6.0)
Remi Collet [Fri, 24 Jan 2020 13:06:19 +0000 (14:06 +0100)]
Add ZipArchive::CM_LZMA2 constant (since libzip 1.6.0)
Christoph M. Becker [Fri, 24 Jan 2020 12:04:26 +0000 (13:04 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Yet another check for php_strip_tags_ex()
Christoph M. Becker [Fri, 24 Jan 2020 11:45:04 +0000 (12:45 +0100)]
Yet another check for php_strip_tags_ex()
Christoph M. Becker [Fri, 24 Jan 2020 11:51:02 +0000 (12:51 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Yet another check for php_strip_tags_ex()
Christoph M. Becker [Fri, 24 Jan 2020 11:45:04 +0000 (12:45 +0100)]
Yet another check for php_strip_tags_ex()
Nikita Popov [Fri, 24 Jan 2020 11:28:54 +0000 (12:28 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't use CRLF when generating diffs
Nikita Popov [Fri, 24 Jan 2020 11:28:37 +0000 (12:28 +0100)]
Don't use CRLF when generating diffs
Nikita Popov [Fri, 24 Jan 2020 10:41:35 +0000 (11:41 +0100)]
Also use zend_memnrstr in mbfl_strpos
Nikita Popov [Fri, 24 Jan 2020 10:29:34 +0000 (11:29 +0100)]
Base mbfl_strpos on zend_memnstr
The same algorithm is also used by zend_memnstr, but it also has
a fast-path for short strings / needles, where a more naive
search performs better.
Nikita Popov [Fri, 24 Jan 2020 10:15:58 +0000 (11:15 +0100)]
Extract calculation of offset from pointer
Nikita Popov [Fri, 24 Jan 2020 09:54:20 +0000 (10:54 +0100)]
Handle mb_str(r)ipos offset consistently as well
Nikita Popov [Fri, 24 Jan 2020 09:29:34 +0000 (10:29 +0100)]
Move offset error checking into mbfl_strpos
This avoids calculating the full length only in order to validate
the offset, as mbfl_strpos needs to find the offset internally
anyway.
Nikita Popov [Fri, 24 Jan 2020 09:02:41 +0000 (10:02 +0100)]
Add #defines for mbfl_strpos error conditions
Nikita Popov [Mon, 6 Jan 2020 11:06:51 +0000 (12:06 +0100)]
Allow variadic arguments to replace non-variadic ones
Any number of arguments can be replaced by a variadic one, so
long as the variadic argument is compatible (in the sense of
contravariance) with the subsumed arguments.
In particular this means that function(...$args) becomes a
near-universal signature: It is compatible with any function
signature that does not accept parameters by-reference.
This also fixes bug #70839, which describes a special case.
Closes GH-5059.
Nikita Popov [Thu, 23 Jan 2020 14:09:59 +0000 (15:09 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug76348.phpt
Nikita Popov [Thu, 23 Jan 2020 14:09:54 +0000 (15:09 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug76348.phpt
Nikita Popov [Thu, 23 Jan 2020 14:08:20 +0000 (15:08 +0100)]
Fix bug76348.phpt
Adjust for URL change in XSD file and mark as online test.
Is it possible for use to store http://x-road.eu/xsd/xroad.xsd
locally instead? Do relative file system paths work here?
I'm not familiar with this.
Nikita Popov [Thu, 23 Jan 2020 13:58:15 +0000 (14:58 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78902
Add unit test for bug #78902
Nikita Popov [Thu, 23 Jan 2020 13:58:01 +0000 (14:58 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #78902
Add unit test for bug #78902
liudaixiao [Mon, 16 Dec 2019 01:10:28 +0000 (09:10 +0800)]
Fixed bug #78902
Léopold Jacquot [Wed, 4 Dec 2019 14:14:50 +0000 (15:14 +0100)]
Add unit test for bug #78902
Nikita Popov [Thu, 23 Jan 2020 13:21:21 +0000 (14:21 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79151
Nikita Popov [Thu, 23 Jan 2020 13:21:14 +0000 (14:21 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79151
Nikita Popov [Thu, 23 Jan 2020 13:19:20 +0000 (14:19 +0100)]
Fixed bug #79151
Make sure we also NULL out next/prev of the removed element on
pop/shift. This only matter is that element is still being referenced
by an iterator.
George Peter Banyard [Thu, 23 Jan 2020 11:57:48 +0000 (12:57 +0100)]
Apply custom format/length modifier removal to spprintf
This mimicks the changes made to the custom snprintf implementation
by removing the custom 'v' format and custom 'I' length modifier
from the spprintf implementation.
Closes GH-5108
Christoph M. Becker [Thu, 23 Jan 2020 12:12:16 +0000 (13:12 +0100)]
Revert "Merge branch 'PHP-7.4'"
This reverts commit
046dcfb531e242d36a7af2942b9b148290c3c7fe , due to
segfaults on Travis. This needs to be investigated.
Nikita Popov [Thu, 23 Jan 2020 11:55:28 +0000 (12:55 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79155
Nikita Popov [Thu, 23 Jan 2020 11:48:45 +0000 (12:48 +0100)]
Fixed bug #79155
Make sure we only unset the NULLABLE flag temporarily for class
resolution, as the same type may be compiled multiple types.
Christoph M. Becker [Thu, 23 Jan 2020 11:00:50 +0000 (12:00 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable UBSan in addition to ASan
Christoph M. Becker [Tue, 31 Dec 2019 10:46:04 +0000 (11:46 +0100)]
Enable UBSan in addition to ASan
UBSan is a useful tool, so we enable it for `--enable-sanitizer` in
addition to ASan.
Christoph M. Becker [Thu, 23 Jan 2020 10:48:20 +0000 (11:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Make MSVCRT memory leak checking usable for the test suite
Christoph M. Becker [Wed, 15 Jan 2020 22:04:03 +0000 (23:04 +0100)]
Make MSVCRT memory leak checking usable for the test suite
While basic support for MSVCRT debugging has been added long
ago[1], the leak checking is not usable for the test suite, because we
are no longer calling `xmlCleanupParser()` on RSHUTDOWN of
ext/libxml[2], and therefore a few bogus leaks are reported whenever
ext/libxml is unloaded.
We therefore ignore memory leaks for this case. We introduce
`ZEND_IGNORE_LEAKS_BEGIN()` and `ZEND_IGNORE_LEAKS_END()` to keep
those ignores better readable, and also because these *might* be
useful for other leak checkers as well.
We also explicitly free the `zend_handlers_table` and the `p5s` to
avoid spurious leak reports.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
d756e1db2324c1f4ab6f9b52e329959ce6a02bc3 >
[2] <http://git.php.net/?p=php-src.git;a=commit;h=
8742276eb3905eb97a585417000c7b8df85006d4 >
Stanislav Malyshev [Thu, 23 Jan 2020 07:06:35 +0000 (23:06 -0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
More checks for php_strip_tags_ex
Stanislav Malyshev [Thu, 23 Jan 2020 07:06:28 +0000 (23:06 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
More checks for php_strip_tags_ex
Stanislav Malyshev [Thu, 23 Jan 2020 06:41:56 +0000 (22:41 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
More checks for php_strip_tags_ex
Stanislav Malyshev [Thu, 23 Jan 2020 06:36:53 +0000 (22:36 -0800)]
More checks for php_strip_tags_ex
George Peter Banyard [Wed, 22 Jan 2020 00:55:12 +0000 (01:55 +0100)]
Add ValueError for invalid mode in count()
Closes GH-5106
Máté Kocsis [Wed, 22 Jan 2020 22:24:28 +0000 (23:24 +0100)]
Add UPGRADING notes [skip ci]
Benjamin Eberlei [Thu, 9 Jan 2020 21:51:15 +0000 (22:51 +0100)]
Add ReflectionProperty::getDefaultValue and ReflectionProperty::hasDefaultValue
Máté Kocsis [Tue, 21 Jan 2020 23:13:29 +0000 (00:13 +0100)]
Fix #78649 Provide ICU RELATIVE_ constants
Closes GH-5105
Christoph M. Becker [Wed, 22 Jan 2020 10:17:20 +0000 (11:17 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't leak encoding_str
Christoph M. Becker [Wed, 22 Jan 2020 10:15:55 +0000 (11:15 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Don't leak encoding_str
Christoph M. Becker [Wed, 22 Jan 2020 10:13:12 +0000 (11:13 +0100)]
Don't leak encoding_str