]>
granicus.if.org Git - php/log
Dmitry Stogov [Wed, 25 Sep 2019 14:30:59 +0000 (17:30 +0300)]
Cleanup CFG optimization
Stephen Reay [Mon, 23 Sep 2019 07:43:56 +0000 (09:43 +0200)]
Adding ldap stubs for arginfo
Gabriel Caruso [Tue, 24 Sep 2019 21:54:04 +0000 (23:54 +0200)]
Remove mention of PHP major version in Copyright headers
Closes GH-4732.
Nikita Popov [Wed, 25 Sep 2019 09:03:19 +0000 (11:03 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 25 Sep 2019 09:02:23 +0000 (11:02 +0200)]
Increase serialize_lock while decoding session
Avoid leaking state between Serializable::unserialize() and
session_decode().
Nikita Popov [Wed, 25 Sep 2019 08:56:27 +0000 (10:56 +0200)]
Remove xfail on bug70219.phpt
Looks like this is working as it's supposed to, the test expectation
just needs to be adjusted.
Christoph M. Becker [Wed, 25 Sep 2019 08:38:32 +0000 (10:38 +0200)]
Just return on throwing ZPP
Christoph M. Becker [Wed, 25 Sep 2019 08:37:36 +0000 (10:37 +0200)]
Add missing zend_parse_parameters_none()
Nikita Popov [Wed, 25 Sep 2019 08:35:26 +0000 (10:35 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 25 Sep 2019 08:34:33 +0000 (10:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 25 Sep 2019 08:34:25 +0000 (10:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Stephen Reay [Wed, 18 Sep 2019 06:33:51 +0000 (08:33 +0200)]
Add SimpleXML arginfo stubs
Jinesh Patel [Mon, 29 Jul 2019 18:19:52 +0000 (14:19 -0400)]
Fix hash key length in umsg_parse_format()
Fix array length passed to zend_hash_str_find_ptr() casting from
UChar array to char array requires mul by sizeof(UChar).
Nikita Popov [Wed, 25 Sep 2019 08:19:34 +0000 (10:19 +0200)]
Merge branch 'PHP-7.4'
Gerard Roche [Mon, 23 Sep 2019 16:09:00 +0000 (17:09 +0100)]
Fix GCOV not working for PHP-7.4 and master branches
Code coverage reports (`make lcov`), since commit
eef8522 (7.4 branch),
generates incorrect coverage and emits warnings. Simplifying the
Makefile.gcov file has the side-effect of resolving the issue.
Processing sapi/cli/php_http_parser.gcda
php-src/lcov_data/sapi/cli/php_http_parser.gcda:stamp mismatch with notes file
geninfo: WARNING: gcov did not create any files for php-src/lcov_data/sapi/cli/php_http_parser.gcda!
...
Processing ext/mbstring/mb_gpc.gcda
php-src/lcov_data/ext/mbstring/mb_gpc.gcda:stamp mismatch with notes file
geninfo: WARNING: gcov did not create any files for php-src/lcov_data/ext/mbstring/mb_gpc.gcda!
Closes: https://bugs.php.net/bug.php?id=52718.
See also: https://bugs.php.net/bug.php?id=78288.
Gabriel Caruso [Tue, 24 Sep 2019 22:07:09 +0000 (00:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use nproc instead of hardcoded number
Gabriel Caruso [Sun, 15 Sep 2019 16:32:11 +0000 (18:32 +0200)]
Use nproc instead of hardcoded number
Christoph M. Becker [Tue, 24 Sep 2019 14:20:18 +0000 (16:20 +0200)]
[ci skip] Update UPGRADING.INTERNALS
Cf. <http://git.php.net/?p=php-src.git;a=commit;h=
0c7124e6beff0a7b0540691db370148be06d242a >.
Christoph M. Becker [Mon, 23 Sep 2019 21:48:36 +0000 (23:48 +0200)]
Add check_only parameter to get_closure handler
`get_closure` handlers are called to check whether an object is
callable, and to actually get the closure, respectively. The behavior
of the handler might differ for these two cases, particularly the
handler may throw in the latter case, but should not in the former.
Therefore we add a `check_only` parameter, to be able to distinguish
the desired purpose.
Nikita Popov [Tue, 24 Sep 2019 10:34:30 +0000 (12:34 +0200)]
Add new entries for exif and unserialize fuzzing corpus
Nikita Popov [Tue, 24 Sep 2019 10:19:14 +0000 (12:19 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 10:39:12 +0000 (12:39 +0200)]
Fixed bug #78589
Don't protect GC while destroying zvals. We may need to add GC
roots during this phase.
Nikita Popov [Tue, 24 Sep 2019 09:32:21 +0000 (11:32 +0200)]
Avoid signed shift
Christoph M. Becker [Tue, 24 Sep 2019 09:16:08 +0000 (11:16 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Christoph M. Becker [Tue, 24 Sep 2019 09:15:28 +0000 (11:15 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Christoph M. Becker [Tue, 24 Sep 2019 09:13:55 +0000 (11:13 +0200)]
Update NEWS
Stanislav Malyshev [Tue, 24 Sep 2019 04:51:26 +0000 (21:51 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78559: Heap buffer overflow in mb_eregi
Stanislav Malyshev [Tue, 24 Sep 2019 04:51:12 +0000 (21:51 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78559: Heap buffer overflow in mb_eregi
Christoph M. Becker [Fri, 20 Sep 2019 17:02:22 +0000 (19:02 +0200)]
Fix #78559: Heap buffer overflow in mb_eregi
We backport kkos/oniguruma@
d3e402928b6eb3327f8f7d59a9edfa622fec557b .
Christoph M. Becker [Mon, 23 Sep 2019 21:04:26 +0000 (23:04 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix NEWS entry
Christoph M. Becker [Mon, 23 Sep 2019 21:03:55 +0000 (23:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix NEWS entry
Christoph M. Becker [Mon, 23 Sep 2019 21:01:38 +0000 (23:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix NEWS entry
Christoph M. Becker [Mon, 23 Sep 2019 20:59:55 +0000 (22:59 +0200)]
Fix NEWS entry
Cf. <https://bugs.php.net/78590>.
Dmitry Stogov [Mon, 23 Sep 2019 20:04:08 +0000 (23:04 +0300)]
Use cheaper code for scalar type check
Dmitry Stogov [Mon, 23 Sep 2019 19:28:56 +0000 (22:28 +0300)]
Change ZEND_RECV and ZEND_RECV_VARIADIC to use extended_value for cache slot (instead of op2), to be consistent with ZEND_RECV_INIT.
Nikita Popov [Mon, 23 Sep 2019 17:41:00 +0000 (19:41 +0200)]
Check that type is set in ZEND_TYPE_IS_MASK()
Allow this macro to be used without an explicit ZEND_TYPE_IS_SET()
check.
Benjamin Eberlei [Sun, 22 Sep 2019 21:15:18 +0000 (23:15 +0200)]
Cleanup ext/dom: Additional unimplemented code following
25bfac4
Nikita Popov [Mon, 23 Sep 2019 15:18:45 +0000 (17:18 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 15:18:39 +0000 (17:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 15:18:33 +0000 (17:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 23 Sep 2019 15:17:52 +0000 (17:17 +0200)]
Fix skipif condition
Nikita Popov [Mon, 23 Sep 2019 14:53:54 +0000 (16:53 +0200)]
Use ZEND_TYPE_IS_SET() when checking for property types
Instead of a simple if or 0 comparison. This would no longer work
if zend_type is a struct.
Nikita Popov [Mon, 23 Sep 2019 14:43:04 +0000 (16:43 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 14:42:59 +0000 (16:42 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 14:42:33 +0000 (16:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 23 Sep 2019 14:42:24 +0000 (16:42 +0200)]
Skip test on 32-bit
Nikita Popov [Mon, 23 Sep 2019 14:33:24 +0000 (16:33 +0200)]
Don't set nullability flag for parameters without type
Use value 0 instead. To compensate we check in ReflectionParameter
allowsNull() whether the type is set at all: If it isn't, it always
allows null.
This removes a discrepancy between internal&userland functions:
For userland functions allowsNull() on untyped parameters returned
true, but for internal functions it returned false.
Nikita Popov [Mon, 23 Sep 2019 14:29:46 +0000 (16:29 +0200)]
Update error messages in some more tests
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.