]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 30 Sep 2019 16:27:31 +0000 (18:27 +0200)]
Add --enable-fuzzer-msan flag
To build fuzzers with memory sanitizer.
Christoph M. Becker [Tue, 1 Oct 2019 09:51:35 +0000 (11:51 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix AppVeyor build
Christoph M. Becker [Tue, 1 Oct 2019 09:51:07 +0000 (11:51 +0200)]
Fix AppVeyor build
`OPENSSL_CONF` must not contain quotes, but actually, we want to test
the default path, so we don't even set `OPENSLL_CONF` anymore.
Christoph M. Becker [Tue, 1 Oct 2019 09:19:43 +0000 (11:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add missing skip keyword in tests
Update NEWS for 7.4.0RC4
Update NEWS for PHP 7.4.0RC3
Christoph M. Becker [Tue, 1 Oct 2019 09:17:23 +0000 (11:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add missing skip keyword in tests
Christoph M. Becker [Tue, 1 Oct 2019 09:15:12 +0000 (11:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add missing skip keyword in tests
Fabien Villepinte [Tue, 1 Oct 2019 08:59:40 +0000 (10:59 +0200)]
Add missing skip keyword in tests
Derick Rethans [Tue, 1 Oct 2019 08:31:43 +0000 (08:31 +0000)]
Update NEWS for 7.4.0RC4
Derick Rethans [Tue, 1 Oct 2019 08:30:24 +0000 (08:30 +0000)]
Update NEWS for PHP 7.4.0RC3
Christoph M. Becker [Tue, 1 Oct 2019 08:01:58 +0000 (10:01 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix AppVeyor setup wrt. changed OpenSSL default config path
Christoph M. Becker [Tue, 1 Oct 2019 08:01:34 +0000 (10:01 +0200)]
Fix AppVeyor setup wrt. changed OpenSSL default config path
Christoph M. Becker [Tue, 1 Oct 2019 07:16:51 +0000 (09:16 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update regarding changed OpenSSL default config path
Christoph M. Becker [Tue, 1 Oct 2019 06:56:56 +0000 (08:56 +0200)]
Update regarding changed OpenSSL default config path
Nikita Popov [Mon, 30 Sep 2019 16:19:56 +0000 (18:19 +0200)]
Pass mode to open() in exif fuzzer
Funny how despite all those sanitizers running, nothing ever
caught this...
Fabien Villepinte [Sat, 28 Sep 2019 15:48:58 +0000 (17:48 +0200)]
Mark test as borked when skipif produces invalid output
SKIPIF section should either output nothing, or start with a
supported keyword like "skip". Mark all tests that don't do so as
BORKED.
Nikita Popov [Mon, 30 Sep 2019 15:52:39 +0000 (17:52 +0200)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Sat, 28 Sep 2019 19:29:54 +0000 (21:29 +0200)]
Fix borked SKIPIFs
Christoph M. Becker [Mon, 30 Sep 2019 14:30:48 +0000 (16:30 +0200)]
Just return after throwing a ValueError
Mark [Fri, 27 Sep 2019 17:47:24 +0000 (19:47 +0200)]
Convert GD Resources to objects
Nikita Popov [Mon, 30 Sep 2019 13:06:51 +0000 (15:06 +0200)]
Merge branch 'PHP-7.4'
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:14:59 +0000 (14:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Skip tests for old versions instead of marking them XFAIL
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:07:19 +0000 (13:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78609: mb_check_encoding() no longer supports stringable objects
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:45 +0000 (12:54 +0200)]
Merge branch 'PHP-7.4'
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 [Fri, 27 Sep 2019 12:27:46 +0000 (14:27 +0200)]
Remove most uses of the ERROR type
It is now only used to signal exceptions for property reads. ERROR
zvals are never returned back to the VM anymore, so there's no
need to check for them when receiving a VAR.
Also return MAY_BE_ERROR, as ERROR is now no longer relevant for
inference.
Nikita Popov [Mon, 30 Sep 2019 08:42:47 +0000 (10:42 +0200)]
Merge branch 'PHP-7.4'
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.
Dmitry Stogov [Mon, 30 Sep 2019 08:40:25 +0000 (11:40 +0300)]
Restore "avoid exception check" optimization and add EG(exception) check only on slow path.
Nikita Popov [Mon, 30 Sep 2019 08:30:20 +0000 (10:30 +0200)]
Merge branch '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 16:22:36 +0000 (18:22 +0200)]
Fix default value
Christoph M. Becker [Sun, 29 Sep 2019 11:58:45 +0000 (13:58 +0200)]
Elevate warning to ValueError for invalid ZipArchive object
Christoph M. Becker [Sun, 29 Sep 2019 11:52:21 +0000 (13:52 +0200)]
Properly clean up files created by test cases
Christoph M. Becker [Sun, 29 Sep 2019 11:49:36 +0000 (13:49 +0200)]
Add missing zend_parse_parameters_none()
Christoph M. Becker [Sun, 29 Sep 2019 10:02:07 +0000 (12:02 +0200)]
Add ZipArchive arginfo stubs
Christoph M. Becker [Sun, 29 Sep 2019 11:39:15 +0000 (13:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix build for libzip < 0.11.2
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.
Nikita Popov [Sun, 29 Sep 2019 09:33:45 +0000 (11:33 +0200)]
Don't use asm arithmetic under msan
Clang 9 supports asm goto, so these no longer get automatically
skipped.
Craig Duncan [Sun, 22 Sep 2019 14:21:51 +0000 (15:21 +0100)]
Convert libxml arginfo to php stubs
Nikita Popov [Sat, 28 Sep 2019 19:30:15 +0000 (21:30 +0200)]
Merge branch 'PHP-7.4'
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:36 +0000 (17:17 +0200)]
Merge branch 'PHP-7.4'
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...)
Christoph M. Becker [Sat, 28 Sep 2019 13:33:27 +0000 (15:33 +0200)]
Add ext/snmp arginfo stubs
Christoph M. Becker [Sat, 28 Sep 2019 11:39:40 +0000 (13:39 +0200)]
Don't return explicit value on failing ZPP
Christoph M. Becker [Sat, 28 Sep 2019 11:33:46 +0000 (13:33 +0200)]
Add missing zend_parse_parameters_none()
Nikita Popov [Fri, 27 Sep 2019 20:31:35 +0000 (22:31 +0200)]
Make fuzzing sapi i386 compatible
* Avoid an unnecessary -lstdc++ dependency. It's not going to be
used in the end anyway, and is an unnecessary hassle to set up.
* Use $LIB_FUZZING_ENGINE instead of hardcoding -lFuzzingEngine.
Nikita Popov [Fri, 27 Sep 2019 15:47:56 +0000 (17:47 +0200)]
Remove unused zend_del_literal() function
Christoph M. Becker [Fri, 27 Sep 2019 21:02:51 +0000 (23:02 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix wrong function name in SKIPIF
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 17:16:35 +0000 (19:16 +0200)]
More ZPP warning to error related test fixes
Christoph M. Becker [Fri, 27 Sep 2019 17:07:29 +0000 (19:07 +0200)]
Fix tests wrt. ZPP warnings to errors
Since these test parts are solely about checking ZPP, we drop them
altogether.
Christoph M. Becker [Fri, 27 Sep 2019 14:35:40 +0000 (16:35 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test regarding Reflection::export() deprecation
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:14:50 +0000 (16:14 +0200)]
Initialize variables
These variables may not be initialized otherwise, but are passed to
another function; although it seems they are not used there, if not
having been initialized, MSVC complains.
Christoph M. Becker [Fri, 27 Sep 2019 14:05:17 +0000 (16:05 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix SKIPIF in ext/mysqli
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
Nikita Popov [Fri, 27 Sep 2019 12:52:20 +0000 (14:52 +0200)]
Convert "Only arrays and Traversables can be unpacked" into Error
Nikita Popov [Fri, 27 Sep 2019 12:47:23 +0000 (14:47 +0200)]
Promote write "use scalar as array" warning to Error
Nikita Popov [Fri, 27 Sep 2019 10:19:31 +0000 (12:19 +0200)]
Remove unused mmap_file + mmap_len from basic_globals
Nikita Popov [Thu, 26 Sep 2019 15:04:43 +0000 (17:04 +0200)]
Add test for illegal unset/isset offset
Weirdly these warnings had zero coverage previously...
Remove an incorrect exception checking optimization: The key
lookup may throw (it could also throw previously, though only
through a custom error handler).
Nikita Popov [Thu, 26 Sep 2019 14:45:54 +0000 (16:45 +0200)]
Convert "Illegal offset type" warnings to exceptions
Nikita Popov [Thu, 26 Sep 2019 14:05:24 +0000 (16:05 +0200)]
Convert "cannot add element" warning to exception
Christoph M. Becker [Fri, 27 Sep 2019 10:52:52 +0000 (12:52 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix skipif.inc
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:20:48 +0000 (11:20 +0200)]
Merge branch 'PHP-7.4'
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:12:13 +0000 (11:12 +0200)]
Merge branch 'PHP-7.4'
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:49:25 +0000 (10:49 +0200)]
Merge branch 'PHP-7.4'
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 10:22:48 +0000 (12:22 +0200)]
Throw Error when writing property of non-object
This removes object auto-vivification support.
This also means that we can remove the corresponding special
handling for typed properites: We no longer need to check that a
property is convertible to stdClass if such a conversion might
take place indirectly due to a nested property write.
Additionally OBJ_W style operations now no longer modify the
object operand, and as such we no longer need to treat op1 as a
def in SSA form.
The next step would be to actually compile the whole LHS of OBJ_W
operations in R rather than W mode, but that causes issues with
SimpleXML, whose object handlers depend on the current compilation
structure.
Part of https://wiki.php.net/rfc/engine_warnings.
Tyson Andre [Thu, 26 Sep 2019 23:58:34 +0000 (19:58 -0400)]
Update opcache zend_func_info after wbmp/xml_parser changes
See UPGRADING on the master branch.
```
- GD:
. The deprecated function image2wbmp() has been removed.
RFC: https://wiki.php.net/rfc/image2wbmp
. The deprecated functions png2wbmp() and jpeg2wbmp() have been removed.
RFC: https://wiki.php.net/rfc/deprecate-png-jpeg-2wbmp
- XML:
. xml_parser_create(_ns) will now return an XmlParser object rather than a
resource.
```
Dmitry Stogov [Thu, 26 Sep 2019 20:21:48 +0000 (23:21 +0300)]
Don't generate useless stubs
Nikita Popov [Thu, 26 Sep 2019 11:50:02 +0000 (13:50 +0200)]
Merge branch 'PHP-7.4'
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:45:47 +0000 (10:45 +0200)]
Limit max length for parser fuzzer
We're getting some very large inputs (~500KB) on OSS-Fuzz, which
slot down performance a lot. Let's try limiting this, starting
with a still fairly large value of 64KB.
Also remove the max_execution_time limit, so that slow test cases
cause a genuine libfuzzer timeout and we may investigate them.
Nikita Popov [Thu, 26 Sep 2019 08:26:12 +0000 (10:26 +0200)]
Merge branch 'PHP-7.4'
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:40:30 +0000 (01:40 +0300)]
Avoid code dupliction