Tyson Andre
0dbc24c3fa
Fix other incorrect opcache types
...
Closes GH-4959.
2019-12-04 07:40:25 +01:00
Tyson Andre
5624d2eb00
Make some opcache types consistent with reflection information
...
Remove functions such as filter_id() where reference counts and types are
identical to what's in opcache.
Remove null types from zend_func_info.c that aren't in Reflection
(php would throw now)
Fix the Reflection type information for assert_options()
php > assert_options(ASSERT_CALLBACK, static function() {});
php > var_export(assert_options(ASSERT_CALLBACK));
Closure::__set_state(array(
))
Closes GH-4958.
2019-12-04 07:31:06 +01:00
Nikita Popov
8dead642fe
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix print_r return types in opcache
2019-12-04 07:17:18 +01:00
Nikita Popov
39b08ba99c
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix print_r return types in opcache
2019-12-04 07:16:56 +01:00
Tyson Andre
c8e9aa854c
Fix print_r return types in opcache
...
https://www.php.net/print_r
> When the return parameter is TRUE, this function will return a string.
> Otherwise, the return value is TRUE.
2019-12-04 07:16:32 +01:00
Christoph M. Becker
f68d2e9c3c
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Next is 7.3.14
2019-12-03 12:09:47 +01:00
Christoph M. Becker
b16b7ad036
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Next is 7.3.14
2019-12-03 12:07:57 +01:00
Christoph M. Becker
65bbc67063
Next is 7.3.14
2019-12-03 12:04:17 +01:00
Remi Collet
ecffa83556
Merge branch 'PHP-7.4'
...
* PHP-7.4:
next is 7.2.27
2019-12-03 11:26:36 +01:00
Remi Collet
322b5de661
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
next is 7.2.27
2019-12-03 11:26:20 +01:00
Remi Collet
3444b90746
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
next is 7.2.27
2019-12-03 11:26:05 +01:00
Remi Collet
d2cfb63f02
next is 7.2.27
2019-12-03 11:25:37 +01:00
Christoph M. Becker
c1a6f2b9cc
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #78883 : fgets(STDIN) fails on Windows
2019-12-02 16:53:35 +01:00
Christoph M. Becker
996f217aa5
Fix #78883 : fgets(STDIN) fails on Windows
...
We add the `is_seekable` member to `php_stdio_stream_data`, and prefer
that over `is_pipe`, since the latter is simply a misnomer. We keep
`is_pipe` for now for Windows only, though, because we need special
support for pipes there. We also fix the misaligned bitfield which
formerly took 33 bit.
2019-12-02 16:52:32 +01:00
Christoph M. Becker
8a5601a364
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #78814 : strip_tags allows / in tag name => whitelist bypass
2019-12-02 11:39:58 +01:00
Christoph M. Becker
3356dd0575
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix #78814 : strip_tags allows / in tag name => whitelist bypass
2019-12-02 11:39:35 +01:00
Christoph M. Becker
861fa60814
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78814 : strip_tags allows / in tag name => whitelist bypass
2019-12-02 11:38:45 +01:00
Christoph M. Becker
600f1f898f
Fix #78814 : strip_tags allows / in tag name => whitelist bypass
...
When normalizing tags to check whether they are contained in the set
of allowable tags, we must not strip slashes, unless they come
immediately after the opening `<`, or immediately before the closing
`>`.
2019-12-02 11:37:25 +01:00
Christoph M. Becker
b07c76059d
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #78296 : is_file fails to detect file
2019-12-02 11:30:23 +01:00
Christoph M. Becker
a9e45bc0fb
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix #78296 : is_file fails to detect file
2019-12-02 11:29:58 +01:00
Christoph M. Becker
bb735c9e9e
Fix #78296 : is_file fails to detect file
...
If we're constructing extended-length paths (i.e. paths prefixed with
`\\?\`), we have to replace all forward slashes with backward slashes,
because the former are not supported by Windows for extended-length
paths.
The more efficient and likely cleaner alternative solution would be to
cater to this in `php_win32_ioutil_normalize_path_w()` by always
replacing forward slashes, but that might break existing code. It
might be sensible to change that for `master`, though.
2019-12-02 11:29:10 +01:00
Christoph M. Becker
0dba3a8e43
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fix #78833 : Integer overflow in pack causes out-of-bound access
2019-12-02 11:21:37 +01:00
Christoph M. Becker
4ff242a9a7
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Fix #78833 : Integer overflow in pack causes out-of-bound access
2019-12-02 11:21:07 +01:00
Christoph M. Becker
3d81c54879
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78833 : Integer overflow in pack causes out-of-bound access
2019-12-02 11:19:15 +01:00
Christoph M. Becker
db420cb6a1
Fix #78833 : Integer overflow in pack causes out-of-bound access
...
We check for potential signed integer overflow, and bail out
gracefully, in that case.
2019-12-02 11:18:19 +01:00
Adam Saponara
b35acd30f2
Fix misleading error message in ZendAccelerator.c.
...
Currently this error emits something like...
`Error Cannot kill process 12345: Success!`
...due to calling `time` before `strerror` which clears `errno`. This
patch adds an error log immediately after both `kill` calls which gives
us better indication of what exactly failed.
2019-12-02 10:06:32 +01:00
Jakub Zelenka
2a742546bf
Merge branch 'PHP-7.4'
2019-12-01 17:17:30 +00:00
Jakub Zelenka
67cd4271e9
Fix bug #78889 (php-fpm service fails to start)
2019-12-01 17:13:20 +00:00
Lucas Martín
c0e049656c
Fix typo in xmm15 register
2019-12-01 12:28:19 +01:00
Stanislav Malyshev
0292d23bb0
Add fuzzing badge to README
2019-11-30 15:56:38 -08:00
Christoph M. Becker
b78885b6da
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Upgrade to Oniguruma 6.9.4
2019-11-30 14:02:14 +01:00
Christoph M. Becker
246b9db569
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Upgrade to Oniguruma 6.9.4
2019-11-30 14:01:25 +01:00
Christoph M. Becker
1979c5d16f
Upgrade to Oniguruma 6.9.4
...
Oniguruma 6.9.4 fixes several CVEs.
2019-11-30 14:00:41 +01:00
Christoph M. Becker
ce5a403b46
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Add missing skip checks
2019-11-29 23:52:52 +01:00
Christoph M. Becker
92cdf2aa7f
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Add missing skip checks
2019-11-29 23:51:12 +01:00
Christoph M. Becker
8c4b0ddde5
Add missing skip checks
2019-11-29 23:50:05 +01:00
Christoph M. Becker
cafa22aa58
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Partially revert "Adapt test cases for Oniguruma 6.9.4"
2019-11-29 23:42:48 +01:00
Christoph M. Becker
f899e5ff17
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Partially revert "Adapt test cases for Oniguruma 6.9.4"
2019-11-29 23:41:39 +01:00
Christoph M. Becker
ff2140c49d
Partially revert "Adapt test cases for Oniguruma 6.9.4"
...
This partially reverts commit c55d09c2f5 ,
because `MB_ONIGURUMA_VERSION` is only available as of PHP 7.4.0, so
that change made no sense for PHP-7.3; we keep it for PHP-7.4, though.
We also stick with the modification to bug78633.phpt.
2019-11-29 23:40:30 +01:00
Dmitry Stogov
f8f48ce8f5
Refactor JIT to reduce back-end dependency from SSA representation.
...
This commit shouldn't change JIT behavior, but it adds asserts, that may catch wrong-cases occasionally passed before.
2019-11-29 19:07:17 +03:00
Christoph M. Becker
bf6c2932f4
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Adapt test cases for Oniguruma 6.9.4
2019-11-29 17:01:11 +01:00
Christoph M. Becker
2b700841c5
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Adapt test cases for Oniguruma 6.9.4
2019-11-29 17:00:11 +01:00
Christoph M. Becker
c55d09c2f5
Adapt test cases for Oniguruma 6.9.4
...
Apparently, bug 78633 has now really been fixed; the former fix only
catered to the buffer overflow, but yielded a wrong result. Also,
the order of the named captures has been fixed.
2019-11-29 16:59:19 +01:00
Dmitry Stogov
3360d05f30
Don't keep QM_ASSIGN with IS_UNUSED result
2019-11-29 17:43:36 +03:00
Tyson Andre
67adcc5132
Remove no-op check for 'use strict;'
...
This should be checking for ZEND_SYMBOL_CLASS, not T_CLASS.
This was first added in 37ac1b96ed
2019-11-28 09:16:15 -05:00
Dmitry Stogov
b7241adf5e
typos
2019-11-28 13:23:17 +03:00
Dmitry Stogov
36175b3c3d
Fixed wrong parameteris order
2019-11-27 16:48:01 +03:00
Dmitry Stogov
40ef3196e0
Fixed register allocation
2019-11-27 16:26:43 +03:00
Christoph M. Becker
b7edbbdbbb
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Prevent parallel test conflicts
2019-11-27 14:05:47 +01:00
Christoph M. Becker
4ac3bda462
Prevent parallel test conflicts
...
The better solution would be to actually use different directory names,
but adding respective CONFLICTS sections solves the issue for now.
2019-11-27 14:04:10 +01:00