]>
granicus.if.org Git - php/log
Nikita Popov [Tue, 20 Oct 2020 13:36:02 +0000 (15:36 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80256
Nikita Popov [Tue, 20 Oct 2020 13:32:01 +0000 (15:32 +0200)]
Fixed bug #80256
Remove the transfer_encoding stream filter immediately when we
destroy the old stream, to make sure it doesn't get attached to
the new stream.
Christoph M. Becker [Tue, 20 Oct 2020 11:37:07 +0000 (13:37 +0200)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Properly fix #80220
Christoph M. Becker [Tue, 20 Oct 2020 11:36:17 +0000 (13:36 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Properly fix #80220
Christoph M. Becker [Tue, 20 Oct 2020 11:34:27 +0000 (13:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Properly fix #80220
Christoph M. Becker [Fri, 16 Oct 2020 09:58:50 +0000 (11:58 +0200)]
Properly fix #80220
The original fix for that bug[1] broke the formerly working composition
of message/rfc822 messages, which results in a segfault when freeing
the message body now. While `imap_mail_compose()` does not really
support composition of meaningful message/rfc822 messages (although
libc-client appears to support that), some code may still use this to
compose partial messages, and using string manipulation to create the
final message.
The point is that libc-client expects `TYPEMESSAGE` with an explicit
subtype of `RFC822` to have a `nested.msg` (otherwise there will be a
segfault during free), but not to have any `contents.text.data` (this
will leak otherwise).
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
0d022ddf03c5fabaaa22e486d1e4a367ed9170a7 >
Closes GH-6343.
Nikita Popov [Tue, 20 Oct 2020 10:51:17 +0000 (12:51 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug #79643: Invalid memory read when opcache.interned_strings_buffer is 0
Nikita Popov [Tue, 20 Oct 2020 10:51:08 +0000 (12:51 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #79643: Invalid memory read when opcache.interned_strings_buffer is 0
twosee [Tue, 9 Jun 2020 06:55:36 +0000 (14:55 +0800)]
Fix bug #79643: Invalid memory read when opcache.interned_strings_buffer is 0
Dmitry Stogov [Tue, 20 Oct 2020 10:46:47 +0000 (13:46 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Improve register allocator (register reuse)
Dmitry Stogov [Tue, 20 Oct 2020 10:46:32 +0000 (13:46 +0300)]
Improve register allocator (register reuse)
Dmitry Stogov [Tue, 20 Oct 2020 09:22:32 +0000 (12:22 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Improve register allocator (give preference to loop variables).
Dmitry Stogov [Tue, 20 Oct 2020 09:19:44 +0000 (12:19 +0300)]
Improve register allocator (give preference to loop variables).
Nikita Popov [Tue, 20 Oct 2020 08:53:01 +0000 (10:53 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix CCM tag length setting for old OpenSSL versions
Nikita Popov [Tue, 20 Oct 2020 08:52:50 +0000 (10:52 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix CCM tag length setting for old OpenSSL versions
Nikita Popov [Tue, 20 Oct 2020 08:50:50 +0000 (10:50 +0200)]
Fix CCM tag length setting for old OpenSSL versions
While OpenSSL 1.1 allows unconditionally setting the CCM tag length
even for decryption, some older versions apparently do not. As such,
we do need to treat CCM and OCB separately after all.
Nikita Popov [Tue, 20 Oct 2020 07:54:10 +0000 (09:54 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Increase timeout on file cache job
[ci skip]
Nikita Popov [Tue, 20 Oct 2020 07:53:50 +0000 (09:53 +0200)]
Increase timeout on file cache job
[ci skip]
Dmitry Stogov [Mon, 19 Oct 2020 23:27:53 +0000 (02:27 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed range propagation
Dmitry Stogov [Mon, 19 Oct 2020 23:27:24 +0000 (02:27 +0300)]
Fixed range propagation
Dmitry Stogov [Mon, 19 Oct 2020 20:23:04 +0000 (23:23 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Avoid partial register stall
Dmitry Stogov [Mon, 19 Oct 2020 20:22:43 +0000 (23:22 +0300)]
Avoid partial register stall
Dmitry Stogov [Mon, 19 Oct 2020 16:43:20 +0000 (19:43 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Use zero-extended mov insted of sign-signed movsxd
Dmitry Stogov [Mon, 19 Oct 2020 16:39:51 +0000 (19:39 +0300)]
Use zero-extended mov insted of sign-signed movsxd
Nikita Popov [Mon, 19 Oct 2020 14:59:00 +0000 (16:59 +0200)]
Use zend_accel_error_noreturn in more places
Missed the place in accelerator_blacklist that was the actual
motivation here...
Nikita Popov [Mon, 19 Oct 2020 14:09:03 +0000 (16:09 +0200)]
Add zend_accel_error_noreturn() helper
Avoid confusing the compiler when code relies on the fact that
LOG_FATAL/LOG_ERROR will bailout/abort.
Nikita Popov [Mon, 19 Oct 2020 13:24:29 +0000 (15:24 +0200)]
Don't use global for array_walk_fci
There's really no good reason for this to be a global, we can
easily pass it down to php_array_walk().
Nikita Popov [Mon, 19 Oct 2020 13:14:57 +0000 (15:14 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80255
Nikita Popov [Mon, 19 Oct 2020 13:13:40 +0000 (15:13 +0200)]
Fixed bug #80255
This was a copy&paste mistake, target_block was used where
follow_block was intended. Also update copy&paste mistakes in
the comments.
Nikita Popov [Mon, 19 Oct 2020 09:24:26 +0000 (11:24 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Revert "Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree"
Nikita Popov [Mon, 19 Oct 2020 09:22:32 +0000 (11:22 +0200)]
Revert "Fix bug #64865: Use CONTEXT_DOCUMENT_ROOT for scanning dir tree"
This reverts commit
98bfad738ad2734dfba5733323f7ba733daf3ec3 .
This doesn't work well in some setups, see bug #80113 and GH-5051.
Reverting this for now.
Nikita Popov [Mon, 19 Oct 2020 09:09:32 +0000 (11:09 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug #79983: Add support for OCB mode
Nikita Popov [Mon, 19 Oct 2020 09:09:17 +0000 (11:09 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #79983: Add support for OCB mode
Nikita Popov [Wed, 14 Oct 2020 11:03:03 +0000 (13:03 +0200)]
Fix bug #79983: Add support for OCB mode
OCB mode ciphers were already exposed to openssl_encrypt/decrypt,
but misbehaved, because they were not treated as AEAD ciphers.
From that perspective, OCB should be treated the same way as GCM.
In OpenSSL 1.1 the necessary controls were unified under
EVP_CTRL_AEAD_* (and OCB is only supported since OpenSSL 1.1).
Closes GH-6337.
Nikita Popov [Mon, 19 Oct 2020 08:45:01 +0000 (10:45 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Disable Laravel testing
Nikita Popov [Mon, 19 Oct 2020 08:43:43 +0000 (10:43 +0200)]
Disable Laravel testing
This has been failing for months now, let's make the scheduled
build status meaningful again.
[ci skip]
Nikita Popov [Mon, 19 Oct 2020 08:35:40 +0000 (10:35 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Add additional initialization checks to SplFileInfo
Updated to version 2020.3 (2020c)
Nikita Popov [Mon, 19 Oct 2020 08:34:17 +0000 (10:34 +0200)]
Add additional initialization checks to SplFileInfo
Derick Rethans [Mon, 19 Oct 2020 08:31:04 +0000 (09:31 +0100)]
Updated to version 2020.3 (2020c)
Derick Rethans [Mon, 19 Oct 2020 08:31:04 +0000 (09:31 +0100)]
Updated to version 2020.3 (2020c)
Derick Rethans [Mon, 19 Oct 2020 08:31:04 +0000 (09:31 +0100)]
Empty merge
Derick Rethans [Mon, 19 Oct 2020 08:31:04 +0000 (09:31 +0100)]
Empty merge
Derick Rethans [Mon, 19 Oct 2020 08:31:03 +0000 (09:31 +0100)]
Updated to version 2020.3 (2020c)
Derick Rethans [Mon, 19 Oct 2020 08:31:03 +0000 (09:31 +0100)]
Empty merge
Derick Rethans [Mon, 19 Oct 2020 08:31:02 +0000 (09:31 +0100)]
Updated to version 2020.3 (2020c)
Nikita Popov [Mon, 19 Oct 2020 08:23:15 +0000 (10:23 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Check PDOStatement initialization during iteration
Nikita Popov [Mon, 19 Oct 2020 08:22:08 +0000 (10:22 +0200)]
Check PDOStatement initialization during iteration
Christoph M. Becker [Sun, 18 Oct 2020 16:27:01 +0000 (18:27 +0200)]
Remove IGNORE_URL_WIN macro
This macro is defined to zero as of PHP 5.0.0, and as the comment
indicates, is no longer relevant. Thus, we remove the definition and
all usages from the core and bundled extensions.
Closes GH-6351.
Máté Kocsis [Sat, 17 Oct 2020 10:01:40 +0000 (12:01 +0200)]
Merge branch 'PHP-8.0'
Máté Kocsis [Sat, 17 Oct 2020 09:29:13 +0000 (11:29 +0200)]
Fix #80229: assert_options should have int and bool for parameter PHPDoc
Closes GH-6348
Alex Dowad [Sat, 19 Sep 2020 16:04:27 +0000 (18:04 +0200)]
Add test suite for ISO-8859-x encoding verification and conversion
Alex Dowad [Fri, 16 Oct 2020 20:03:27 +0000 (22:03 +0200)]
Do not pass invalid ISO-8859-{3,6,7,8} characters through silently
mbstring has a bad habit of passing invalid characters through silently
when converting to the same (or a "compatible") encoding.
For example, if you give it an invalid JIS X 0208 kuten code encoded with SJIS,
and try to convert that to EUC-JP, mbstring will just quietly re-encode the
invalid code in the EUC-JP representation.
At the same, some parts of the code (like `mb_check_encoding`) assume that
invalid characters will be treated as... well, invalid. Let's unbreak things
by actually catching errors and reporting them, instead of swallowing them.
Alex Dowad [Sat, 19 Sep 2020 18:41:01 +0000 (20:41 +0200)]
Add identify filter for ISO-8859-8 (Latin/Hebrew)
Alex Dowad [Sat, 19 Sep 2020 18:38:13 +0000 (20:38 +0200)]
Add identify filter for ISO-8859-7 (Latin/Greek)
Alex Dowad [Sat, 19 Sep 2020 18:34:13 +0000 (20:34 +0200)]
Add identify filter for ISO-8859-6 (Latin/Arabic)
Note that some text encoding conversion libraries, such as Solaris iconv
and FreeBSD iconv, map 0x30-0x39 to the Arabic script numerals rather than
the 'regular' Roman numerals. (That is, to Unicode codepoints 0x660-0x669.)
Further, Windows CP28596 adds more mappings to use the unused bytes in
ISO-8859-6.
Alex Dowad [Sat, 19 Sep 2020 18:27:55 +0000 (20:27 +0200)]
Add identify filter for ISO-8859-3 (Latin-3)
There are some bytes in this encoding which are not mapped to any character.
Notably, MicroSoft added their own mappings for these 'unused' bits in their
version of Latin-3, called CP28593.
Alex Dowad [Mon, 7 Sep 2020 06:42:16 +0000 (08:42 +0200)]
Add identify filter for ISO-8859-16 (Latin-10) encoding
Interestingly, it looks like the original author intended to add an identify filter
for this encoding, but never did so. The needed struct is there, but was never added
to the list of identify filters in mbfl_ident.c.
Nikita Popov [Fri, 16 Oct 2020 16:38:34 +0000 (18:38 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Properly handle NULL output start filename
Nikita Popov [Fri, 16 Oct 2020 16:38:03 +0000 (18:38 +0200)]
Properly handle NULL output start filename
Nikita Popov [Fri, 16 Oct 2020 15:32:02 +0000 (17:32 +0200)]
Remove unused global
Nikita Popov [Fri, 16 Oct 2020 15:29:22 +0000 (17:29 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Make sure output start filename is not freed early
Nikita Popov [Fri, 16 Oct 2020 15:23:10 +0000 (17:23 +0200)]
Make sure output start filename is not freed early
As filenames are no longer interned, we need to keep a reference
to the zend_string to make sure it isn't freed.
To avoid a nominal source compatibility break, create a new member
in the globals.
Nikita Popov [Fri, 16 Oct 2020 14:58:58 +0000 (16:58 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix leak when setting dynamic property on generator
Nikita Popov [Fri, 16 Oct 2020 14:57:50 +0000 (16:57 +0200)]
Fix leak when setting dynamic property on generator
Christoph M. Becker [Fri, 16 Oct 2020 10:16:28 +0000 (12:16 +0200)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
[ci skip] Make it clear what GD uses instead of resources
Anatoly Pashin [Fri, 16 Oct 2020 09:06:11 +0000 (19:06 +1000)]
[ci skip] Make it clear what GD uses instead of resources
Closes GH-6342.
Máté Kocsis [Fri, 16 Oct 2020 09:00:05 +0000 (11:00 +0200)]
Merge branch 'PHP-8.0'
Máté Kocsis [Tue, 13 Oct 2020 18:03:00 +0000 (20:03 +0200)]
Verify parameter names of function aliases
Closes GH-6335
Nikita Popov [Thu, 15 Oct 2020 12:50:34 +0000 (14:50 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
DragonFlyBSD build update for opcache JIT part.
David Carlier [Wed, 14 Oct 2020 18:49:30 +0000 (19:49 +0100)]
DragonFlyBSD build update for opcache JIT part.
Closes GH-6339.
Dmitry Stogov [Thu, 15 Oct 2020 12:27:59 +0000 (15:27 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Avoid refcounting when return CV (similar to optimization in VM).
Dmitry Stogov [Thu, 15 Oct 2020 12:27:00 +0000 (15:27 +0300)]
Avoid refcounting when return CV (similar to optimization in VM).
Nikita Popov [Thu, 15 Oct 2020 12:24:44 +0000 (14:24 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug #80055
Nikita Popov [Thu, 15 Oct 2020 10:46:07 +0000 (12:46 +0200)]
Fix bug #80055
We need to perform trait scope fixup for both methods involved
in the inheritance check. For that purpose we already need to
thread through a separate fn scope through the entire inheritance
checking machinery.
Christoph M. Becker [Thu, 15 Oct 2020 11:21:27 +0000 (13:21 +0200)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Fix broken fix for #80239
Christoph M. Becker [Thu, 15 Oct 2020 11:20:58 +0000 (13:20 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix broken fix for #80239
Christoph M. Becker [Thu, 15 Oct 2020 11:19:30 +0000 (13:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix broken fix for #80239
Christoph M. Becker [Thu, 15 Oct 2020 11:18:34 +0000 (13:18 +0200)]
Fix broken fix for #80239
No idea why that `git am` failed that badly.
Christoph M. Becker [Thu, 15 Oct 2020 10:58:07 +0000 (12:58 +0200)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Fix #80239: imap_rfc822_write_address() leaks memory
Christoph M. Becker [Thu, 15 Oct 2020 10:57:13 +0000 (12:57 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80239: imap_rfc822_write_address() leaks memory
Christoph M. Becker [Thu, 15 Oct 2020 10:55:44 +0000 (12:55 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #80239: imap_rfc822_write_address() leaks memory
Christoph M. Becker [Thu, 15 Oct 2020 10:51:10 +0000 (12:51 +0200)]
Fix #80239: imap_rfc822_write_address() leaks memory
We have to free the address when we're finished with it.
Côme Chilliet [Thu, 15 Oct 2020 09:49:38 +0000 (11:49 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Change $controls parameter to default to null in ext/ldap
Côme Chilliet [Thu, 15 Oct 2020 09:46:44 +0000 (11:46 +0200)]
Change $controls parameter to default to null in ext/ldap
It appeared that not passing $controls and passing [] caused different
behaviors, when not passing it the controls set through ldap_set_option
would be used, when passing [] they would not.
So, this parameter is now nullable and defaults to null to have a
consistent behavior.
Nikita Popov [Thu, 15 Oct 2020 08:46:40 +0000 (10:46 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Skip arginfo test under msan
Nikita Popov [Thu, 15 Oct 2020 08:40:23 +0000 (10:40 +0200)]
Skip arginfo test under msan
Msan is missing interceptors for some functions that result in
false positives.
Nikita Popov [Thu, 15 Oct 2020 08:18:13 +0000 (10:18 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix leak in gmp_export()
Nikita Popov [Thu, 15 Oct 2020 08:17:55 +0000 (10:17 +0200)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix leak in gmp_export()
Nikita Popov [Thu, 15 Oct 2020 08:16:56 +0000 (10:16 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix leak in gmp_export()
Nikita Popov [Thu, 15 Oct 2020 08:16:22 +0000 (10:16 +0200)]
Fix leak in gmp_export()
Christoph M. Becker [Wed, 14 Oct 2020 17:12:32 +0000 (19:12 +0200)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Adapt test expectation to cURL 7.73.0
Christoph M. Becker [Wed, 14 Oct 2020 16:50:56 +0000 (18:50 +0200)]
Adapt test expectation to cURL 7.73.0
cURL 7.73.0 introduced support for the MQTT protocol, so we have to
adapt our expectations regarding the supported protocols.
Nikita Popov [Wed, 14 Oct 2020 14:58:13 +0000 (16:58 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Sync zpp in phar interceptors
Nikita Popov [Wed, 14 Oct 2020 14:57:38 +0000 (16:57 +0200)]
Sync zpp in phar interceptors
This should match the zpp of the intercepted functions...
Nikita Popov [Wed, 14 Oct 2020 14:40:57 +0000 (16:40 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix null foreground in imagewbmp
Mark ldap_exop() param as UNKNOWN
Nikita Popov [Wed, 14 Oct 2020 14:40:09 +0000 (16:40 +0200)]
Fix null foreground in imagewbmp
The variable was not actually passed to zpp...
Nikita Popov [Wed, 14 Oct 2020 09:43:22 +0000 (11:43 +0200)]
Mark ldap_exop() param as UNKNOWN
This function actually has very different behavior depending on
whether $response_data is passed or not.
Nikita Popov [Wed, 14 Oct 2020 14:26:27 +0000 (16:26 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
More arginfo/zpp verification
Nikita Popov [Tue, 21 Jul 2020 14:21:14 +0000 (16:21 +0200)]
More arginfo/zpp verification
Run all functions with a varying number of null arguments, which
helps us flush out all kinds of bugs.
Closes GH-5881.
Nikita Popov [Wed, 14 Oct 2020 09:58:44 +0000 (11:58 +0200)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Initialize calendar_long variable