]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 23 Sep 2019 14:12:18 +0000 (16:12 +0200)]
Canonicalize typed prop/param default value errors
Use shared logic to determine what values are valid, and a single
error message format.
Nikita Popov [Mon, 23 Sep 2019 13:59:47 +0000 (15:59 +0200)]
Check for nullable void type earlier
Nikita Popov [Mon, 23 Sep 2019 13:48:49 +0000 (15:48 +0200)]
Canonicalize typed properties error message
We have lots of other typed properties related error messages of
the form "assign X to typed property Y::$z of type A", so use th
same format for the primary message as well. Special-casing things
like classes and nullability is not going to scale with future
type-system extensions, and I don't think it really adds clarity
either.
Nikita Popov [Fri, 20 Sep 2019 13:33:56 +0000 (15:33 +0200)]
Standardize type printing in reflection
Use ?T instead of "T or NULL".
Nikita Popov [Thu, 19 Sep 2019 10:11:29 +0000 (12:11 +0200)]
Change representation of zend_type from type code to MAY_BE_* mask
This switches zend_type from storing a single IS_* type code to
storing a MAY_BE_* type mask. Right now most code still assumes
that there is only a single type in the mask (or two together
with MAY_BE_NULL). But this will make it a lot simpler to introduce
union types.
An additional advantage (and why I'm doing this separately), is
that a number of special cases no longer need to be handled
separately: We can do a single mask & (1 << type) check to handle
all simple types, booleans (true|false) and null.
Nikita Popov [Mon, 23 Sep 2019 12:52:45 +0000 (14:52 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 12:52:40 +0000 (14:52 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 12:52:32 +0000 (14:52 +0200)]
Skip test on 32-bit
Nikita Popov [Mon, 23 Sep 2019 11:47:43 +0000 (13:47 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 11:47:38 +0000 (13:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 11:47:05 +0000 (13:47 +0200)]
Commit regenerated var_unserializer.c
Nikita Popov [Mon, 23 Sep 2019 11:34:42 +0000 (13:34 +0200)]
Remove commented code
Nikita Popov [Mon, 23 Sep 2019 11:19:05 +0000 (13:19 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 11:18:59 +0000 (13:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 11:18:39 +0000 (13:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 23 Sep 2019 11:16:58 +0000 (13:16 +0200)]
Fix signed integer overflow in SplObjectStorage unserialization
If count is ZEND_LONG_MIN the count-- loop underflows. This is
ultimately harmless, but results in a ubsan warning.
Fix this by adding a sanity check that the count isn't negative,
because that doesn't make sense...
Nikita Popov [Mon, 23 Sep 2019 11:09:12 +0000 (13:09 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 11:09:01 +0000 (13:09 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 11:06:55 +0000 (13:06 +0200)]
Fix ubsan violation in parse_iv2
This fixes two issues:
* Negative the value in an unsigned type to avoid signed overflow.
* Treat -0 as 0 rather than an invalid number that gets converted
to ZEND_LONG_MIN.
Christoph M. Becker [Mon, 23 Sep 2019 07:54:59 +0000 (09:54 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Allow lookup of distro-packaged QDBM headers on Debian
Stephen Reay [Sun, 22 Sep 2019 15:51:36 +0000 (22:51 +0700)]
Allow lookup of distro-packaged QDBM headers on Debian
Stephen Reay [Sun, 22 Sep 2019 16:13:35 +0000 (18:13 +0200)]
Added arginfo stubs for IMAP extension
Christoph M. Becker [Sun, 22 Sep 2019 16:19:37 +0000 (18:19 +0200)]
Add missing zend_parse_parameters_none()
Christoph M. Becker [Sun, 22 Sep 2019 16:55:20 +0000 (18:55 +0200)]
Add skip reasons
Christoph M. Becker [Sun, 22 Sep 2019 16:43:45 +0000 (18:43 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test to be skipped if dom is not available
Christoph M. Becker [Sun, 22 Sep 2019 16:43:24 +0000 (18:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test to be skipped if dom is not available
Christoph M. Becker [Sun, 22 Sep 2019 16:42:40 +0000 (18:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test to be skipped if dom is not available
Christoph M. Becker [Sun, 22 Sep 2019 16:39:55 +0000 (18:39 +0200)]
Fix test to be skipped if dom is not available
Christoph M. Becker [Sun, 22 Sep 2019 14:38:21 +0000 (16:38 +0200)]
Just return on ZPP exception
No need to return FALSE.
Christoph M. Becker [Sun, 22 Sep 2019 14:31:19 +0000 (16:31 +0200)]
Fix arginfo of tidy_repair_string()
Cf.
5356bad8c66d9df437c5136d02f6654a5b56b2b9 .
Christoph M. Becker [Sun, 22 Sep 2019 14:28:42 +0000 (16:28 +0200)]
Remove unused parameter
The `$use_include_path` parameter doesn't make sense for
`tidy_repair_string()`, and actually unused, so we remove it.
Christoph M. Becker [Sun, 22 Sep 2019 14:17:23 +0000 (16:17 +0200)]
Add ext/tidy stubs
Christoph M. Becker [Sun, 22 Sep 2019 12:29:42 +0000 (14:29 +0200)]
Properly use zend_parse_method_parameters()
`zend_parse_method_parameters()` is meant for dual (procedural and OO)
APIs; there is no need to attempt to get "this" first, and to dispatch
to `zend_parse_parameters()` and `zend_parse_method_parameters()`,
respectively.
Christoph M. Becker [Wed, 18 Sep 2019 15:54:25 +0000 (17:54 +0200)]
Add ext/dba stubs
Nikita Popov [Sun, 22 Sep 2019 10:13:22 +0000 (12:13 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Sun, 22 Sep 2019 10:10:49 +0000 (12:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Sun, 22 Sep 2019 10:10:42 +0000 (12:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Sun, 22 Sep 2019 10:10:17 +0000 (12:10 +0200)]
Fix leak of temporary buffer during exif tag reading
Nikita Popov [Sun, 22 Sep 2019 08:27:21 +0000 (10:27 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Sun, 22 Sep 2019 08:27:07 +0000 (10:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Sun, 22 Sep 2019 08:26:57 +0000 (10:26 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 21 Sep 2019 22:58:14 +0000 (00:58 +0200)]
Employ zend_parse_method_parameters()
Nikita Popov [Sat, 21 Sep 2019 18:38:24 +0000 (20:38 +0200)]
Fix multiple leaks in exif_read_data()
This fixes two leaks related to duplicate tags, as well as a leak
of zero-length FMT_(S)BYTE with non-null value. This can show up
for MAKERNOTE values where the original length is non-zero, but
the first character is a null byte.
Christoph M. Becker [Sat, 21 Sep 2019 16:13:31 +0000 (18:13 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix length of key passed to zend_hash_str_find_ptr
Christoph M. Becker [Sat, 21 Sep 2019 16:13:06 +0000 (18:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix length of key passed to zend_hash_str_find_ptr
Christoph M. Becker [Sat, 21 Sep 2019 16:12:27 +0000 (18:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix length of key passed to zend_hash_str_find_ptr
Jinesh Patel [Mon, 29 Jul 2019 18:21:25 +0000 (14:21 -0400)]
Fix length of key passed to zend_hash_str_find_ptr
Christoph M. Becker [Sat, 21 Sep 2019 14:25:17 +0000 (16:25 +0200)]
Remove unused parameter
Cf. <https://bugs.php.net/78579>.
Christoph M. Becker [Sat, 21 Sep 2019 14:18:20 +0000 (16:18 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78579: mb_decode_numericentity: args number inconsistency
Christoph M. Becker [Sat, 21 Sep 2019 14:17:33 +0000 (16:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78579: mb_decode_numericentity: args number inconsistency
Christoph M. Becker [Sat, 21 Sep 2019 14:16:09 +0000 (16:16 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78579: mb_decode_numericentity: args number inconsistency
Christoph M. Becker [Sat, 21 Sep 2019 13:56:06 +0000 (15:56 +0200)]
Fix #78579: mb_decode_numericentity: args number inconsistency
mb_decode_numericentity() accepts a fourth optional parameter, which is
unused, however. Since this parameter doesn't do any harm, and to avoid
the small BC break, we're keeping this parameter for PHP 7, but adjust
the arginfo.
For PHP 8, we will remove this parameter.
Bishop Bettini [Fri, 20 Sep 2019 16:59:50 +0000 (12:59 -0400)]
[ci skip] Add phar + imap maintainer email
Looks like commit
c09b13cb (Add Bishop Bettini as maintainer for
phar & imap, 2019-03-16) missed adding my email address.
Remi Collet [Fri, 20 Sep 2019 11:30:28 +0000 (13:30 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78574 (broken shared build)
Remi Collet [Fri, 20 Sep 2019 11:30:13 +0000 (13:30 +0200)]
Fixed bug #78574 (broken shared build)
Christoph M. Becker [Thu, 19 Sep 2019 18:06:28 +0000 (20:06 +0200)]
Make MSVC happy again
MSVC complains about unsupported preprocessor syntax, so we employ the
same workaround as in zend_cpuinfo.h.
Craig Duncan [Mon, 16 Sep 2019 17:07:49 +0000 (19:07 +0200)]
Convert soap functions arginfo to php stubs
We alos make the last parameter of `SoapClient::__setCookie()` and
`SoapFault::__construct()` properly nullable.
Craig Duncan [Mon, 26 Aug 2019 17:06:18 +0000 (18:06 +0100)]
Convert pcntl functions arginfo to php stubs
Dmitry Stogov [Thu, 19 Sep 2019 20:46:45 +0000 (23:46 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't buid static libaraies when only DSO required
Dmitry Stogov [Thu, 19 Sep 2019 20:44:53 +0000 (23:44 +0300)]
Don't buid static libaraies when only DSO required
Nikita Popov [Thu, 19 Sep 2019 19:14:54 +0000 (21:14 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 19:14:46 +0000 (21:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 19:14:40 +0000 (21:14 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 19:11:57 +0000 (21:11 +0200)]
Fix out-of-bounds read in exif tag reading
This issue was recently introduced in
c739023a50876e2a90588f915803b0140a95638e ,
when the restriction that components>0 has been relaxed. We now need
to make sure that any tags that expect at least one component check
that this is the case.
Nikita Popov [Thu, 19 Sep 2019 19:02:20 +0000 (21:02 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 16:29:13 +0000 (18:29 +0200)]
Clean up JSON parser
Don't use <value> type for JSON tokens that don't have a value
and remove the errlex productions -- we're going to get an
unexpected token error anyway, there's no need to handle these
explicitly.
This also removes the awkward workarounds for the unused value
warnings.
Dmitry Stogov [Thu, 19 Sep 2019 18:53:36 +0000 (21:53 +0300)]
Fixed 32-bit JIT
Stephen Reay [Thu, 19 Sep 2019 09:37:58 +0000 (16:37 +0700)]
Convert IMAP function aliases
These are not really aliases, convert them to normal functions.
Closes GH-4725.
Nikita Popov [Thu, 19 Sep 2019 15:22:34 +0000 (17:22 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 15:22:28 +0000 (17:22 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 15:21:45 +0000 (17:21 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 15:20:10 +0000 (17:20 +0200)]
Fix iterable return type optimization
Nikita Popov [Thu, 19 Sep 2019 12:20:38 +0000 (14:20 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 12:20:13 +0000 (14:20 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 12:20:04 +0000 (14:20 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 19 Sep 2019 12:16:36 +0000 (14:16 +0200)]
Fix exif leak on duplicate copyright tags
Nikita Popov [Thu, 19 Sep 2019 09:36:29 +0000 (11:36 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 19 Sep 2019 09:36:19 +0000 (11:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 19 Sep 2019 09:36:09 +0000 (11:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
CJDennis [Wed, 18 Sep 2019 10:03:24 +0000 (20:03 +1000)]
Fix typo
`sizeof("data")-1` and `sizeof("date")-1` are both 4, so no change in behaviour
Nikita Popov [Wed, 18 Sep 2019 13:43:32 +0000 (15:43 +0200)]
Don't make argument nullable based on AST null initializer
Closes GH-4720.
Christoph M. Becker [Thu, 19 Sep 2019 07:17:53 +0000 (09:17 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78543: is_callable() on FFI\CData throws Exception
Christoph M. Becker [Wed, 18 Sep 2019 09:55:20 +0000 (11:55 +0200)]
Fix #78543: is_callable() on FFI\CData throws Exception
If `Z_OBJ_HANDLER_P(callable, get_closure)` throws, we must not let the
exeception pass to userland, if called through `is_callable()`.
George Peter Banyard [Sat, 31 Aug 2019 23:34:55 +0000 (01:34 +0200)]
Indicate entry is skipped in error message
Nikita Popov [Wed, 18 Sep 2019 14:37:23 +0000 (16:37 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Sep 2019 14:37:14 +0000 (16:37 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 14:36:29 +0000 (16:36 +0200)]
Remove unstable test output
This may be printed in a different order, and we don't care about
it anyway.
Nikita Popov [Wed, 18 Sep 2019 12:11:36 +0000 (14:11 +0200)]
Change instructions to use oniguruma from git
Some bugs are already fixed there.
[ci skip]
Dmitry Stogov [Wed, 18 Sep 2019 11:03:07 +0000 (14:03 +0300)]
Optimize access to thread local cache.
This patch saves one CPU instruction on each "_tsrm_ls_cache" access in ZTS CLI/CGI/FPM builds.
This reduce typical instruction sequence for EG(current_execute_data) access from 4 to 3 CPU instructions.
Nikita Popov [Wed, 18 Sep 2019 09:53:15 +0000 (11:53 +0200)]
Add instructions for building an instrumented libonig
[ci skip]
Craig Duncan [Sat, 10 Aug 2019 15:50:18 +0000 (16:50 +0100)]
Convert session functions arginfo to php stubs
Nikita Popov [Wed, 18 Sep 2019 08:45:19 +0000 (10:45 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Sep 2019 08:45:07 +0000 (10:45 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 07:44:00 +0000 (09:44 +0200)]
Fixed bug #78272
Use MAP_JIT only when running under hardened runtime, because MAP_JIT
is incompatible with fork().
The check is based on
https://github.com/mono/mono/commit/
f879e35e3ed7496d819bd766deb8be6992d068ed .
Nikita Popov [Wed, 18 Sep 2019 08:13:35 +0000 (10:13 +0200)]
Add debugging code to usleep()
To see if intermittent CI failures are caused by a signal interrupt.
Nikita Popov [Wed, 18 Sep 2019 07:31:52 +0000 (09:31 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 18 Sep 2019 07:31:44 +0000 (09:31 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 18 Sep 2019 07:28:54 +0000 (09:28 +0200)]
Backport MAP_JIT fixes from PCRE2 10.33
This is intended to fix the primary issue from bug #77260.
Prior to macOS 10.14 multiple MAP_JIT segments were not permitted,
leading to mmap failures and corresponding "no more memory" errors
on macOS 10.13.
Christoph M. Becker [Sat, 14 Sep 2019 16:31:59 +0000 (18:31 +0200)]
Change XMLWriter resources to objects
While we generally prefer objects over resources for quite a while, the
procedural XMLWriter API still uses resources, although there is
already an object-oriented API which uses objects. This dichotomy
makes no sense, slightly complicates the implementation, and doesn't
allow a stepwise migration to the object-oriented API, which might be
desired. Thus we completely drop the XMLWriter resources in favor of
XMLWriter objects.
We consider the minor BC break acceptable for a major version, since
only explicit type checks (`is_resource()`, `gettype()` etc.) need to
be adapted.
Benjamin Eberlei [Tue, 17 Sep 2019 21:52:08 +0000 (23:52 +0200)]
Upgrading notes for removed ext/dom classes.