]>
granicus.if.org Git - php/log
Christoph M. Becker [Tue, 2 Feb 2021 16:11:19 +0000 (17:11 +0100)]
[ci skip] Merge branch 'PHP-8.0'
* PHP-8.0:
7.3.28 is next
Christoph M. Becker [Tue, 2 Feb 2021 16:08:00 +0000 (17:08 +0100)]
[ci skip] Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
7.3.28 is next
Christoph M. Becker [Tue, 2 Feb 2021 16:03:05 +0000 (17:03 +0100)]
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
7.3.28 is next
Christoph M. Becker [Tue, 2 Feb 2021 16:01:55 +0000 (17:01 +0100)]
7.3.28 is next
Nikita Popov [Tue, 2 Feb 2021 15:47:03 +0000 (16:47 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Update year to 2021
Nikita Popov [Tue, 2 Feb 2021 15:46:52 +0000 (16:46 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Update year to 2021
Peter Kokot [Sun, 24 Jan 2021 11:23:20 +0000 (12:23 +0100)]
Update year to 2021
Closes GH-6636.
Nikita Popov [Tue, 2 Feb 2021 15:44:12 +0000 (16:44 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Remove unnecessary cast in snmp_set_oid_output_format
Nikita Popov [Tue, 2 Feb 2021 15:43:43 +0000 (16:43 +0100)]
Remove unnecessary cast in snmp_set_oid_output_format
This cast isn't needed, and could result in the ValueError being
skipped due to truncation.
Nikita Popov [Tue, 2 Feb 2021 09:32:25 +0000 (10:32 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Add missing derefs in CurlFile
Nikita Popov [Tue, 2 Feb 2021 09:32:11 +0000 (10:32 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add missing derefs in CurlFile
Nikita Popov [Tue, 2 Feb 2021 09:31:16 +0000 (10:31 +0100)]
Add missing derefs in CurlFile
As pointed out on GH-6456.
Nikita Popov [Tue, 2 Feb 2021 09:07:19 +0000 (10:07 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix persistent leak on load_wsdl_ex failure
Nikita Popov [Tue, 2 Feb 2021 09:07:04 +0000 (10:07 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix persistent leak on load_wsdl_ex failure
Nikita Popov [Tue, 2 Feb 2021 09:05:35 +0000 (10:05 +0100)]
Fix persistent leak on load_wsdl_ex failure
Move the load_wsdl_ex call into the zend_try that destroys the
docs hash table. The wsdl will be inserted into docs early on,
and will thus be released on subsequent bailout.
Christoph M. Becker [Mon, 1 Feb 2021 12:44:42 +0000 (13:44 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Revert "Updated to version 2021.1 (2021a)"
Christoph M. Becker [Mon, 1 Feb 2021 12:43:57 +0000 (13:43 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Revert "Updated to version 2021.1 (2021a)"
Christoph M. Becker [Mon, 1 Feb 2021 12:42:43 +0000 (13:42 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Revert "Updated to version 2021.1 (2021a)"
Christoph M. Becker [Mon, 1 Feb 2021 12:41:32 +0000 (13:41 +0100)]
Revert "Updated to version 2021.1 (2021a)"
This reverts commit
491488d21707062fa8e9b9187db3585fb0d347da , since
PHP-7.3 is in security mode, and this does not look security related.
Christoph M. Becker [Mon, 1 Feb 2021 12:01:27 +0000 (13:01 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #80654: file_get_contents() maxlen fails above (2**31)-1 bytes
Christoph M. Becker [Mon, 1 Feb 2021 11:59:22 +0000 (12:59 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80654: file_get_contents() maxlen fails above (2**31)-1 bytes
Christoph M. Becker [Thu, 28 Jan 2021 16:00:16 +0000 (17:00 +0100)]
Fix #80654: file_get_contents() maxlen fails above (2**31)-1 bytes
We remove the arbitrary restriction to `INT_MAX`; it is superfluous on
32bit systems where `ZEND_LONG_MAX == INT_MAX` anyway, and not useful
on 64bit systems, where larger files should be readable, if the
`memory_limit` is large enough.
Closes GH-6648.
Levi Morrison [Mon, 1 Feb 2021 05:32:24 +0000 (22:32 -0700)]
Document .dtor_obj and .free_obj
Closes GH-6656.
Co-authored-by: Nikita Popov <nikic@php.net>
twosee [Mon, 1 Feb 2021 04:56:59 +0000 (12:56 +0800)]
Fix environment variable not work in run-tests.php
Closes GH-6657.
David CARLIER [Sat, 30 Jan 2021 09:47:52 +0000 (09:47 +0000)]
Fix ubsan warning on macos
Closes GH-6652.
Nikita Popov [Mon, 1 Feb 2021 09:24:18 +0000 (10:24 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
XFAIL observer_error_05.phpt test
Nikita Popov [Mon, 1 Feb 2021 09:24:00 +0000 (10:24 +0100)]
XFAIL observer_error_05.phpt test
Nikita Popov [Mon, 1 Feb 2021 09:10:09 +0000 (10:10 +0100)]
Create .php and .sh on valgrind failure
Nikita Popov [Mon, 1 Feb 2021 08:49:19 +0000 (09:49 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix Laravel build on community job
Nikita Popov [Mon, 1 Feb 2021 08:49:13 +0000 (09:49 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix Laravel build on community job
Nikita Popov [Thu, 28 Jan 2021 09:24:48 +0000 (10:24 +0100)]
Fix Laravel build on community job
Now requires PHP 7.4, so use php7.4 to run composer everywhere.
Nikita Popov [Mon, 1 Feb 2021 08:46:39 +0000 (09:46 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix build
crc32 mac build fix
Nikita Popov [Mon, 1 Feb 2021 08:46:27 +0000 (09:46 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix build
Nikita Popov [Mon, 1 Feb 2021 08:46:17 +0000 (09:46 +0100)]
Fix build
David CARLIER [Sat, 30 Jan 2021 09:45:01 +0000 (09:45 +0000)]
crc32 mac build fix
Closes GH-6651.
Stanislav Malyshev [Mon, 1 Feb 2021 08:17:02 +0000 (00:17 -0800)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix bug #80672 - Null Dereference in SoapClient
Stanislav Malyshev [Mon, 1 Feb 2021 05:42:48 +0000 (21:42 -0800)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #80672 - Null Dereference in SoapClient
Stanislav Malyshev [Mon, 1 Feb 2021 05:42:41 +0000 (21:42 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #80672 - Null Dereference in SoapClient
Stanislav Malyshev [Mon, 1 Feb 2021 05:15:23 +0000 (21:15 -0800)]
Fix bug #80672 - Null Dereference in SoapClient
Christoph M. Becker [Thu, 28 Jan 2021 22:26:26 +0000 (23:26 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Add missing stub for SodiumException
Christoph M. Becker [Thu, 28 Jan 2021 18:01:20 +0000 (19:01 +0100)]
Add missing stub for SodiumException
Closes GH-6649.
Remi Collet [Thu, 28 Jan 2021 15:27:00 +0000 (16:27 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
NEWS
NEWS
Fix #80682 opcache doesn't honour pcre.jit option
Remi Collet [Thu, 28 Jan 2021 15:26:46 +0000 (16:26 +0100)]
NEWS
Remi Collet [Thu, 28 Jan 2021 15:26:26 +0000 (16:26 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
NEWS
Fix #80682 opcache doesn't honour pcre.jit option
Remi Collet [Thu, 28 Jan 2021 15:25:35 +0000 (16:25 +0100)]
NEWS
Remi Collet [Thu, 28 Jan 2021 15:24:39 +0000 (16:24 +0100)]
Fix #80682 opcache doesn't honour pcre.jit option
Dmitry Stogov [Thu, 28 Jan 2021 13:38:36 +0000 (16:38 +0300)]
Remove useless zend_update_class_constants() calls
Nikita Popov [Tue, 26 Jan 2021 14:53:49 +0000 (15:53 +0100)]
Move optimizer into core
This only moves the files, adjusts the build system, exports APIs
and does minor fixups to make sure the code builds.
This does not yet try to make the optimizer usable independently
of opcache.
Closes GH-6642.
Nikita Popov [Thu, 28 Jan 2021 09:15:45 +0000 (10:15 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix stub for Serializable::serialize()
Michael Voříšek [Wed, 27 Jan 2021 12:54:15 +0000 (13:54 +0100)]
Fix stub for Serializable::serialize()
This method may also return null.
Nikita Popov [Thu, 28 Jan 2021 09:04:17 +0000 (10:04 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Observe fake closures
Sammy Kaye Powers [Fri, 15 Jan 2021 18:07:40 +0000 (10:07 -0800)]
Observe fake closures
Closes GH-6607.
Stanislav Malyshev [Wed, 27 Jan 2021 08:19:21 +0000 (00:19 -0800)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:18:49 +0000 (00:18 -0800)]
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:15:50 +0000 (00:15 -0800)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:15:43 +0000 (00:15 -0800)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:15:13 +0000 (00:15 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 08:13:43 +0000 (00:13 -0800)]
Rm unneeded function
Stanislav Malyshev [Wed, 27 Jan 2021 07:01:40 +0000 (23:01 -0800)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Alternative fix for bug 77423
Stanislav Malyshev [Wed, 27 Jan 2021 06:55:16 +0000 (22:55 -0800)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Alternative fix for bug 77423
Stanislav Malyshev [Wed, 27 Jan 2021 06:55:10 +0000 (22:55 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Alternative fix for bug 77423
Christoph M. Becker [Tue, 19 Jan 2021 10:23:25 +0000 (11:23 +0100)]
Alternative fix for bug 77423
That bug report originally was about `parse_url()` misbehaving, but the
security aspect was actually only regarding `FILTER_VALIDATE_URL`.
Since the changes to `parse_url_ex()` apparently affect userland code
which is relying on the sloppy URL parsing[1], this alternative
restores the old parsing behavior, but ensures that the userinfo is
checked for correctness for `FILTER_VALIDATE_URL`.
[1] <https://github.com/php/php-src/commit/
5174de7cd33c3d4fa591c9c93859ff9989b07e8c #commitcomment-
45967652 >
Dmitry Stogov [Tue, 26 Jan 2021 18:31:51 +0000 (21:31 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed observer API and JIT compatibility
Dmitry Stogov [Tue, 26 Jan 2021 18:31:15 +0000 (21:31 +0300)]
Fixed observer API and JIT compatibility
Christoph M. Becker [Tue, 26 Jan 2021 18:15:56 +0000 (19:15 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #70091: Phar does not mark UTF-8 filenames in ZIP archives
Christoph M. Becker [Tue, 26 Jan 2021 18:15:00 +0000 (19:15 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #70091: Phar does not mark UTF-8 filenames in ZIP archives
Christoph M. Becker [Tue, 26 Jan 2021 15:50:04 +0000 (16:50 +0100)]
Fix #70091: Phar does not mark UTF-8 filenames in ZIP archives
The default encoding of filenames in a ZIP archive is IBM Code Page
437. Phar, however, only supports UTF-8 filenames. Therefore we have
to mark filenames as being stored in UTF-8 by setting the general
purpose bit 11 (the language encoding flag).
The effect of not setting this bit for non ASCII filenames can be seen
in popular tools like 7-Zip and UnZip, but not when extracting the
archives via ext/phar (which is agnostic to the filename encoding), or
via ext/zip (which guesses the encoding). Thus we add a somewhat
brittle low-level test case.
Closes GH-6630.
Christoph M. Becker [Tue, 26 Jan 2021 18:10:04 +0000 (19:10 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Update version
Christoph M. Becker [Tue, 26 Jan 2021 18:09:35 +0000 (19:09 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Update version
Christoph M. Becker [Tue, 26 Jan 2021 18:07:57 +0000 (19:07 +0100)]
Update version
That appears to have been forgotten for a while.
Dmitry Stogov [Tue, 26 Jan 2021 16:25:50 +0000 (19:25 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Allow observer handlers disabling optimization in RETURN opcode handler, that may cause loss value of returned local variable.
Dmitry Stogov [Tue, 26 Jan 2021 16:23:13 +0000 (19:23 +0300)]
Allow observer handlers disabling optimization in RETURN opcode handler, that may cause loss value of returned local variable.
Nikita Popov [Tue, 26 Jan 2021 16:10:26 +0000 (17:10 +0100)]
Remove unused mmap member in phpdbg_file_source
Dmitry Stogov [Tue, 26 Jan 2021 15:44:56 +0000 (18:44 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Skip dummy frames allocated on CPU stack of zend_call_function(). (Usage of "current_observed_frame" varible looks unsafe to me).
Dmitry Stogov [Tue, 26 Jan 2021 15:41:26 +0000 (18:41 +0300)]
Skip dummy frames allocated on CPU stack of zend_call_function().
(Usage of "current_observed_frame" varible looks unsafe to me).
Nikita Popov [Tue, 26 Jan 2021 14:18:04 +0000 (15:18 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix VAR return type verification
Nikita Popov [Tue, 26 Jan 2021 14:15:18 +0000 (15:15 +0100)]
Fix VAR return type verification
We should also set retval_ref when de-indirecting. Otherwise the
retval_ref != retval_ptr comparison below may incorrect assume
that we're returning a reference.
I don't have a reliable reproducer for this issue, but it sometimes
appears in certain configurations in arrow_functions/007.phpt in
conjunction with other changes.
Nikita Popov [Tue, 26 Jan 2021 11:44:53 +0000 (12:44 +0100)]
Fix proptable canonicalization bypass in ArrayObject
When an ArrayObject wraps an object, we should be using the
proptable canonicalilzation rules, which require all keys to be
strings.
Nikita Popov [Tue, 26 Jan 2021 11:50:28 +0000 (12:50 +0100)]
Add missing resource key warning for unset()
It was present on other operations, including isset(), but was
missing for unset().
Máté Kocsis [Tue, 26 Jan 2021 10:50:36 +0000 (11:50 +0100)]
Add support for generating class entries from stubs
Closes GH-6289
Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
David CARLIER [Wed, 20 Jan 2021 20:03:56 +0000 (20:03 +0000)]
Distinguishing opcache SHM on stats tools for Mac
Closes GH-6628.
Christoph M. Becker [Mon, 25 Jan 2021 17:49:50 +0000 (18:49 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #75850: Unclear error message wrt. __halt_compiler() w/o semicolon
Christoph M. Becker [Mon, 25 Jan 2021 17:48:35 +0000 (18:48 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #75850: Unclear error message wrt. __halt_compiler() w/o semicolon
Christoph M. Becker [Mon, 25 Jan 2021 16:12:48 +0000 (17:12 +0100)]
Fix #75850: Unclear error message wrt. __halt_compiler() w/o semicolon
We add the failure reason to the error message.
Closes GH-6638.
Nikita Popov [Mon, 25 Jan 2021 15:18:11 +0000 (16:18 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Improve switch continue warning
Nikita Popov [Mon, 25 Jan 2021 15:17:14 +0000 (16:17 +0100)]
Improve switch continue warning
Don't suggest "continue N+1" if there is no wrapping loop. The
resulting code would be illegal.
Nikita Popov [Mon, 25 Jan 2021 14:51:20 +0000 (15:51 +0100)]
Remove unnecessary TRUE/FALSE defines in tidy
Instead use standard true/false.
Christoph M. Becker [Mon, 25 Jan 2021 14:44:44 +0000 (15:44 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #53251: bindtextdomain with null dir doesn't return old value
Christoph M. Becker [Fri, 22 Jan 2021 12:08:51 +0000 (13:08 +0100)]
Fix #53251: bindtextdomain with null dir doesn't return old value
Apparently, users expect `bindtextdomain` and `bind_textdomain_codeset`
with `null` as second argument to work like their C counterparts,
namely to return the previously set value. Thus, we support that.
Closes GH-6631.
Nikita Popov [Mon, 25 Jan 2021 14:11:56 +0000 (15:11 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix opcache phpize build on FreeBSD
Updated to version 2021.1 (2021a)
Alex Samorukov [Fri, 8 Jan 2021 18:09:09 +0000 (19:09 +0100)]
Fix opcache phpize build on FreeBSD
Closes GH-6589.
tzmfreedom [Sun, 17 Jan 2021 05:13:19 +0000 (14:13 +0900)]
Allow specifying sqlite3 DSN (file:/) in PDO SQLite
Closes GH-6610.
Nikita Popov [Mon, 25 Jan 2021 13:36:18 +0000 (14:36 +0100)]
Fix parsing of semi-reserved tokens at offset > 4 GB
To avoid increasing the size of parser stack elements by storing
size_t offset and length, this instead only stores the start
offset (or rather pointer now) and determines the length of the
identifier in zend_lex_tstring.
Derick Rethans [Mon, 25 Jan 2021 10:44:07 +0000 (10:44 +0000)]
Updated to version 2021.1 (2021a)
Derick Rethans [Mon, 25 Jan 2021 10:44:07 +0000 (10:44 +0000)]
Empty merge
Derick Rethans [Mon, 25 Jan 2021 10:44:06 +0000 (10:44 +0000)]
Updated to version 2021.1 (2021a)
Derick Rethans [Mon, 25 Jan 2021 10:44:06 +0000 (10:44 +0000)]
Empty merge
Derick Rethans [Mon, 25 Jan 2021 10:44:05 +0000 (10:44 +0000)]
Updated to version 2021.1 (2021a)
Derick Rethans [Mon, 25 Jan 2021 10:44:05 +0000 (10:44 +0000)]
Empty merge
Derick Rethans [Mon, 25 Jan 2021 10:44:04 +0000 (10:44 +0000)]
Updated to version 2021.1 (2021a)