]>
granicus.if.org Git - php/log
Christoph M. Becker [Tue, 1 Oct 2019 06:56:56 +0000 (08:56 +0200)]
Update regarding changed OpenSSL default config path
Fabien Villepinte [Sat, 28 Sep 2019 19:29:54 +0000 (21:29 +0200)]
Fix borked SKIPIFs
Nikita Popov [Mon, 30 Sep 2019 13:06:43 +0000 (15:06 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 30 Sep 2019 13:06:23 +0000 (15:06 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 30 Sep 2019 13:05:35 +0000 (15:05 +0200)]
Fixed bug #78612
Christoph M. Becker [Mon, 30 Sep 2019 12:12:40 +0000 (14:12 +0200)]
Skip tests for old versions instead of marking them XFAIL
According to commit
0eea9a6 [1], these tests fail with old Oniguruma
versions; we are not sure which version of Oniguruma is required to let
them pass, but at least 6.9.3 is sufficient.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
0eea9a642941ab5d4c612f8092f186977afbb73e >
Christoph M. Becker [Mon, 30 Sep 2019 11:05:51 +0000 (13:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78609: mb_check_encoding() no longer supports stringable objects
Christoph M. Becker [Mon, 30 Sep 2019 11:04:24 +0000 (13:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78609: mb_check_encoding() no longer supports stringable objects
Nikita Popov [Mon, 30 Sep 2019 10:54:18 +0000 (12:54 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Sergei Turchanov [Wed, 28 Aug 2019 04:37:52 +0000 (14:37 +1000)]
Fix #78413: php-fpm request_terminate_timeout does not take effect after fastcgi_finish_request
To retain legacy behavior I decided to add an option to control request
termination logic. If request_terminate_timeout_track_finished is set,
then request will be tracked for time limits even after
fastcgi_finish_request was called.
This patch depends on the fix provided in BUG 78469 (otherwise php-fpm
workers listening on named pipes on Windows will be erroneously terminated)
(PR #4636)
Christoph M. Becker [Mon, 30 Sep 2019 09:07:03 +0000 (11:07 +0200)]
Fix #78609: mb_check_encoding() no longer supports stringable objects
We apply type juggling for other types than array.
Nikita Popov [Mon, 30 Sep 2019 08:41:14 +0000 (10:41 +0200)]
Fixed bug #78604
<?php followed by EOF is valid since PHP 7.4.
Nikita Popov [Tue, 24 Sep 2019 09:50:26 +0000 (11:50 +0200)]
Add max_depth option to unserialize()
Add a max_depth option to unserialize and an unserialize_max_depth
ini setting, which can be used to control the depth limit. The
default value is 4096.
This option is intended to prevent stack overflows during the
unserialization of deeply nested structures.
This fixes bug #78549 and addresses oss-fuzz #17581, #17589, #17664,
and #17788.
Christoph M. Becker [Sun, 29 Sep 2019 11:38:28 +0000 (13:38 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix build for libzip < 0.11.2
Christoph M. Becker [Sun, 29 Sep 2019 11:34:16 +0000 (13:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix build for libzip < 0.11.2
Christoph M. Becker [Sun, 29 Sep 2019 11:31:22 +0000 (13:31 +0200)]
Fix build for libzip < 0.11.2
We must not define method entries, if the actual method definitions or
the arginfo structures are not defined.
Tyson Andre [Sat, 28 Sep 2019 13:54:43 +0000 (09:54 -0400)]
Reduce memory used by token_get_all()
Around a quarter of all strings in array tokens would have a string that's one
character long (e.g. ` `, `\`, `1`)
For parsing a large number of php files,
The memory increase dropped from
378374248 to
369535688 (2.5%)
Closes GH-4753.
Nikita Popov [Sat, 28 Sep 2019 15:17:18 +0000 (17:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Sat, 28 Sep 2019 15:15:36 +0000 (17:15 +0200)]
Don't throw warnings during heredoc scan-ahead
Otherwise these warnings will turn up twice (or more...)
Fabien Villepinte [Fri, 27 Sep 2019 14:12:13 +0000 (16:12 +0200)]
Fix wrong function name in SKIPIF
Christoph M. Becker [Fri, 27 Sep 2019 14:31:49 +0000 (16:31 +0200)]
Fix test regarding Reflection::export() deprecation
Christoph M. Becker [Fri, 27 Sep 2019 14:04:35 +0000 (16:04 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix SKIPIF in ext/mysqli
Christoph M. Becker [Fri, 27 Sep 2019 14:04:00 +0000 (16:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix SKIPIF in ext/mysqli
Fabien Villepinte [Fri, 27 Sep 2019 12:06:17 +0000 (14:06 +0200)]
Fix SKIPIF in ext/mysqli
Christoph M. Becker [Fri, 27 Sep 2019 10:52:14 +0000 (12:52 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix skipif.inc
Christoph M. Becker [Fri, 27 Sep 2019 10:51:21 +0000 (12:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix skipif.inc
Christoph M. Becker [Fri, 27 Sep 2019 10:50:04 +0000 (12:50 +0200)]
Fix skipif.inc
Nikita Popov [Fri, 27 Sep 2019 09:18:50 +0000 (11:18 +0200)]
XFAIL sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt
This is supposed to be addressed by GH-4007, but that seems stalled
for now.
Nikita Popov [Fri, 27 Sep 2019 09:16:22 +0000 (11:16 +0200)]
Enable ubsan stack trace printing on community job
Try to do this using "variables" -- apparently these get uppercased
and are made available as environment variables.
Nikita Popov [Fri, 27 Sep 2019 09:10:42 +0000 (11:10 +0200)]
Fix file clash in rename_variation.phpt
rename_variation2.tmp is ... unsurprisingly ... already used by
rename_variation2.phpt. Alternatively it could be placed in the
directory that the test creates, but maybe this is intended to
test cross-directory renames, so I'll leave it.
Nikita Popov [Fri, 27 Sep 2019 08:39:21 +0000 (10:39 +0200)]
Handle resources used as array keys consistently
Resources used as array keys are generally handled by throwing a
notice and converting the resource to the resource handle. The only
exception is the [$resource => null] syntax, where this was treated
as an illegal offset type instead. However, this also only happened
for VM evaluations, the AST evaluator did handle resources correctly.
Nikita Popov [Thu, 26 Sep 2019 11:47:41 +0000 (13:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 26 Sep 2019 11:47:19 +0000 (13:47 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 26 Sep 2019 11:45:45 +0000 (13:45 +0200)]
Fix memory leak with ** on array operands
Nikita Popov [Thu, 26 Sep 2019 08:25:55 +0000 (10:25 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 26 Sep 2019 08:25:40 +0000 (10:25 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 26 Sep 2019 08:24:49 +0000 (10:24 +0200)]
Fix null-pointer deref in if stmt printing
Fixes OSS-Fuzz #17721.
Dmitry Stogov [Wed, 25 Sep 2019 22:17:54 +0000 (01:17 +0300)]
Fixed GOTO VM
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.
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
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).
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 [Sun, 15 Sep 2019 16:32:11 +0000 (18:32 +0200)]
Use nproc instead of hardcoded number
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.
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: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: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>.
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: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 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: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: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: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.
Stephen Reay [Sun, 22 Sep 2019 15:51:36 +0000 (22:51 +0700)]
Allow lookup of distro-packaged QDBM headers on Debian
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
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: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
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: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: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.
Remi Collet [Fri, 20 Sep 2019 11:30:13 +0000 (13:30 +0200)]
Fixed bug #78574 (broken shared build)
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: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 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.
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: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: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