]>
granicus.if.org Git - php/log
Nikita Popov [Thu, 24 Oct 2019 13:40:25 +0000 (15:40 +0200)]
Don't check ZEND_TYPE_IS_SET() in zend_check_type()
Usually this function is only used if we already know that there is
a type. Add checks to the places where we don't.
Nikita Popov [Thu, 24 Oct 2019 13:26:24 +0000 (15:26 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Skip IntlTimeZone::getOffset() error tests on non-x86
Nikita Popov [Thu, 24 Oct 2019 12:41:05 +0000 (14:41 +0200)]
Skip IntlTimeZone::getOffset() error tests on non-x86
I'm not totally sure, but I have a strong suspicion that the fact
that this produces an error is an artifact of undefined cast behavior
(which will yield INDVAL on x86 but saturate on ARM). INF seems to
be the only value that results in an error even on x86 (variations
like -INF or NAN succeed).
It might make sense to just remove this test entirely, but for now
let's skip it on non-x86.
Nikita Popov [Thu, 24 Oct 2019 12:47:15 +0000 (14:47 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Skip large ftruncate test if large files not supported
Don't test "blocks" in lstat_stat_variation7.phpt
Increase FD used in php://fd test
Use posix_getuid() to check for root in pcntl_setpriority() test
Nikita Popov [Thu, 24 Oct 2019 12:32:11 +0000 (14:32 +0200)]
Skip large ftruncate test if large files not supported
Nikita Popov [Thu, 24 Oct 2019 12:26:17 +0000 (14:26 +0200)]
Don't test "blocks" in lstat_stat_variation7.phpt
This stat property seems to be somewhat unreliable depending on the
filesystem. On Travis ARM64 CI a much larger payload is required
to get this value to increase.
Nikita Popov [Thu, 24 Oct 2019 10:28:43 +0000 (12:28 +0200)]
Increase FD used in php://fd test
Nikita Popov [Thu, 24 Oct 2019 10:19:24 +0000 (12:19 +0200)]
Use posix_getuid() to check for root in pcntl_setpriority() test
Using SUDO_USER doesn't seem to work on Travis ARM CI -- I guess
that sudo might be in use without the target being root.
Remi Collet [Thu, 24 Oct 2019 05:43:56 +0000 (07:43 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
typo and better wording
Remi Collet [Thu, 24 Oct 2019 05:43:49 +0000 (07:43 +0200)]
typo and better wording
Remi Collet [Thu, 24 Oct 2019 05:40:27 +0000 (07:40 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Added suppot for glob() wildcard matching in ffi.preload directive
Reverting push to wrong repo
Update alloc patch
Dmitry Stogov [Wed, 23 Oct 2019 14:18:11 +0000 (17:18 +0300)]
Added suppot for glob() wildcard matching in ffi.preload directive
Rasmus Lerdorf [Wed, 23 Oct 2019 21:34:12 +0000 (14:34 -0700)]
Reverting push to wrong repo
Rasmus Lerdorf [Wed, 23 Oct 2019 21:31:27 +0000 (14:31 -0700)]
Update alloc patch
Dmitry Stogov [Wed, 23 Oct 2019 16:54:52 +0000 (19:54 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Ignore ZEND_FFI_TYPE_OWNED flag
Dmitry Stogov [Wed, 23 Oct 2019 16:50:58 +0000 (19:50 +0300)]
Ignore ZEND_FFI_TYPE_OWNED flag
Nikita Popov [Wed, 23 Oct 2019 15:42:16 +0000 (17:42 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix aarch64 crc32 implementation
Nikita Popov [Wed, 23 Oct 2019 14:58:47 +0000 (16:58 +0200)]
Fix aarch64 crc32 implementation
RETVAL vs RETURN mixup resulted in the fallback implementation
running as well.
Nikita Popov [Wed, 23 Oct 2019 10:21:32 +0000 (12:21 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't autoload when checking property types
Nikita Popov [Wed, 23 Oct 2019 10:19:33 +0000 (12:19 +0200)]
Don't autoload when checking property types
Noticed while working on union types: We do not load argument and
return types during type checks, but we do load property types.
I'm normalizing the behavior towards the existing status quo (not
loading), though we may consider loading everywhere (all types,
and instanceof) in order to properly support class aliases.
Nikita Popov [Tue, 22 Oct 2019 13:32:57 +0000 (15:32 +0200)]
JIT: Add option to disable SSA checks
Nikita Popov [Wed, 23 Oct 2019 08:56:50 +0000 (10:56 +0200)]
JIT: Handle typed refs in assign dim
Colin O'Dell [Mon, 21 Oct 2019 21:22:04 +0000 (17:22 -0400)]
Allow array_splice() length to be null
Colin O'Dell [Tue, 22 Oct 2019 10:32:41 +0000 (06:32 -0400)]
Document the changes to substr functions
Nikita Popov [Wed, 23 Oct 2019 09:18:05 +0000 (11:18 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use ICU's CXXFLAGS when using pkg-config
Nikita Popov [Wed, 23 Oct 2019 09:18:01 +0000 (11:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Use ICU's CXXFLAGS when using pkg-config
Nikita Popov [Wed, 23 Oct 2019 09:17:46 +0000 (11:17 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Use ICU's CXXFLAGS when using pkg-config
Ryan Schmidt [Tue, 22 Oct 2019 21:19:35 +0000 (16:19 -0500)]
Use ICU's CXXFLAGS when using pkg-config
This mirrors how ICU's CXXFLAGS are already used when using icu-config.
Nikita Popov [Wed, 23 Oct 2019 09:07:49 +0000 (11:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well
Nikita Popov [Wed, 23 Oct 2019 09:07:41 +0000 (11:07 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well
Nikita Popov [Wed, 23 Oct 2019 09:07:16 +0000 (11:07 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well
Nikita Popov [Wed, 23 Oct 2019 09:06:51 +0000 (11:06 +0200)]
Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well
This is a backport of
c518932c0326a938f0fd0254f2adb03b1cddfbca
from the PHP 7.4 branch.
Christoph M. Becker [Wed, 23 Oct 2019 08:47:59 +0000 (10:47 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Added missing call to ZipArchive::close()
Florian Engelhardt [Wed, 23 Oct 2019 08:16:07 +0000 (10:16 +0200)]
Added missing call to ZipArchive::close()
Nikita Popov [Tue, 22 Oct 2019 14:39:40 +0000 (16:39 +0200)]
JIT: Fix handling of typed ref in assign dim op
Nikita Popov [Tue, 22 Oct 2019 14:20:15 +0000 (16:20 +0200)]
JIT: Fix handling of typed ref in assign op
Nikita Popov [Tue, 22 Oct 2019 13:33:12 +0000 (15:33 +0200)]
JIT: Check exception after jit_assign_dim_op_helper
Nikita Popov [Tue, 22 Oct 2019 12:59:24 +0000 (14:59 +0200)]
JIT: UNDEF result on "Illegal offset type" exception
Remi Collet [Wed, 23 Oct 2019 05:49:29 +0000 (07:49 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
add new ffi.preload option in php.ini and display ini entries in MINFO
Remi Collet [Wed, 23 Oct 2019 05:49:13 +0000 (07:49 +0200)]
add new ffi.preload option in php.ini and display ini entries in MINFO
Christoph M. Becker [Tue, 22 Oct 2019 15:54:28 +0000 (17:54 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typo
Christoph M. Becker [Tue, 22 Oct 2019 15:53:34 +0000 (17:53 +0200)]
Fix typo
Dmitry Stogov [Tue, 22 Oct 2019 14:53:24 +0000 (17:53 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Allow loading FFI bindings through ffi.preload directive
Dmitry Stogov [Tue, 22 Oct 2019 14:52:56 +0000 (17:52 +0300)]
Allow loading FFI bindings through ffi.preload directive
Colin O'Dell [Mon, 21 Oct 2019 18:49:08 +0000 (14:49 -0400)]
Accept null lengths for substr functions()
If a null $length is passed to any of these functions, behave as if no
parameter was passed:
- substr()
- substr_count()
- substr_compare()
- iconv_substr()
Colin O'Dell [Mon, 21 Oct 2019 20:04:57 +0000 (16:04 -0400)]
Add Z_PARAM_LONG_OR_NULL macro
Christoph M. Becker [Tue, 22 Oct 2019 09:39:40 +0000 (11:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78716: Function name mangling is wrong for some parameter types
Christoph M. Becker [Tue, 22 Oct 2019 09:33:00 +0000 (11:33 +0200)]
Fix #78716: Function name mangling is wrong for some parameter types
We have to cater to function parameter alignment when calculating the
parameter size.
Nikita Popov [Mon, 21 Oct 2019 14:13:09 +0000 (16:13 +0200)]
Fix and undeprecate ReflectionType::__toString()
Add deprecated _ZendTestClass::__toString() method to preserve
an existing test.
ReflectionType::__toString() will now return a complete
representation of the type, as it should have originally. Users
that relied on nullability being absent should have been pushed
to ReflectionNamedType::getName() by the deprecation of
ReflectionType::__toString() in PHP 7.1 / PHP 7.4.
Nikita Popov [Tue, 22 Oct 2019 09:13:02 +0000 (11:13 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add a run with opcache to the coverage job
Fabien Villepinte [Mon, 21 Oct 2019 19:48:33 +0000 (21:48 +0200)]
Add a run with opcache to the coverage job
Some tests are not run when OPcache is not available.
This should make the results more accurate.
Christoph M. Becker [Tue, 22 Oct 2019 07:53:05 +0000 (09:53 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Christoph M. Becker [Tue, 22 Oct 2019 07:51:44 +0000 (09:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Christoph M. Becker [Tue, 22 Oct 2019 07:50:11 +0000 (09:50 +0200)]
Update NEWS
Remi Collet [Tue, 22 Oct 2019 07:38:18 +0000 (09:38 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
add NEWS entry
Remi Collet [Tue, 22 Oct 2019 07:38:05 +0000 (09:38 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
add NEWS entry
Remi Collet [Tue, 22 Oct 2019 07:37:51 +0000 (09:37 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add NEWS entry
Remi Collet [Tue, 22 Oct 2019 07:37:35 +0000 (09:37 +0200)]
add NEWS entry
Stanislav Malyshev [Mon, 21 Oct 2019 20:17:32 +0000 (13:17 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
bump versions after release
set versions for release
Stanislav Malyshev [Mon, 21 Oct 2019 20:17:27 +0000 (13:17 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
bump versions after release
set versions for release
Stanislav Malyshev [Mon, 21 Oct 2019 20:17:19 +0000 (13:17 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
bump versions after release
set versions for release
Stanislav Malyshev [Mon, 21 Oct 2019 20:17:09 +0000 (13:17 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
bump versions after release
set versions for release
Fabien Villepinte [Mon, 21 Oct 2019 19:33:30 +0000 (21:33 +0200)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Mon, 21 Oct 2019 19:31:36 +0000 (21:31 +0200)]
Revert "Add tests for ReflectionZendExtension"
This reverts commit
4194e0415b02827b0d5eeff13771eb6642955b0f .
There were already tests for this class.
Fabien Villepinte [Mon, 21 Oct 2019 19:17:50 +0000 (21:17 +0200)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Mon, 21 Oct 2019 19:17:16 +0000 (21:17 +0200)]
Add tests for ReflectionZendExtension
Dmitry Stogov [Mon, 21 Oct 2019 11:53:03 +0000 (14:53 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78512 (Cannot make preload work)
Dmitry Stogov [Mon, 21 Oct 2019 11:52:26 +0000 (14:52 +0300)]
Fixed bug #78512 (Cannot make preload work)
Nikita Popov [Mon, 21 Oct 2019 10:17:43 +0000 (12:17 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix static prop cleanup for dl'ed internal classes
Nikita Popov [Mon, 21 Oct 2019 09:30:00 +0000 (11:30 +0200)]
Fix static prop cleanup for dl'ed internal classes
Nikita Popov [Mon, 21 Oct 2019 08:27:35 +0000 (10:27 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix leak with cycle in static prop of internal class
Nikita Popov [Mon, 21 Oct 2019 08:26:10 +0000 (10:26 +0200)]
Fix leak with cycle in static prop of internal class
More the cleanup of interned classes before the final GC run,
just like it is done for user classes.
Christoph M. Becker [Sun, 20 Oct 2019 16:37:33 +0000 (18:37 +0200)]
Add ext/sodium arginfo stubs
Joe Watkins [Mon, 21 Oct 2019 07:24:57 +0000 (09:24 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78697: inaccurate error message
Joe Watkins [Mon, 21 Oct 2019 07:23:44 +0000 (09:23 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #78697: inaccurate error message
Joe Watkins [Mon, 21 Oct 2019 07:22:32 +0000 (09:22 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #78697: inaccurate error message
Fabien Villepinte [Sat, 19 Oct 2019 19:27:37 +0000 (21:27 +0200)]
Fix bug #78697: inaccurate error message
Stanislav Malyshev [Mon, 21 Oct 2019 06:20:26 +0000 (23:20 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78633: Heap buffer overflow (read) in mb_eregi
Stanislav Malyshev [Mon, 21 Oct 2019 06:20:16 +0000 (23:20 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78633: Heap buffer overflow (read) in mb_eregi
Jakub Zelenka [Sat, 12 Oct 2019 14:56:16 +0000 (15:56 +0100)]
Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
Christoph M. Becker [Fri, 4 Oct 2019 17:02:37 +0000 (19:02 +0200)]
Fix #78633: Heap buffer overflow (read) in mb_eregi
We backport kkos/oniguruma@
15c4228aa2ffa02140a99912dd3177df0b1841c6 .
Jakub Zelenka [Sun, 20 Oct 2019 15:59:30 +0000 (16:59 +0100)]
Merge branch 'PHP-7.4'
Jakub Zelenka [Sun, 20 Oct 2019 15:58:13 +0000 (16:58 +0100)]
Add NEWS for the fixed bug #74083
Maksim Nikulin [Thu, 25 Jul 2019 06:15:35 +0000 (13:15 +0700)]
Skip fpm bug #74083 test on Windows
Have not expected side effects of `include`.
Maksim Nikulin [Thu, 25 Jul 2019 04:41:36 +0000 (11:41 +0700)]
Add (slow) test for fpm concurrent reloads #74083
Maksim Nikulin [Wed, 24 Jul 2019 09:50:57 +0000 (16:50 +0700)]
Block signals during fpm master initialization
Fix PHP-FPM failure in the case of concurrent reload attempts.
Postpone signal delivery to the fpm master process till proper signal
handlers are set. Prevent the following case:
- Running master process receives `SIGUSR2` and performs `execvp()`.
- Another `SIGUSR2` is arrived before signal handlers are set.
- Master process dies.
- Requests to the HTTP server handled by PHP-fpm can not be served
any more.
Block some signals using `sigprocmask()` before `execvp()` and early
in the `main()` function. Unblock signals as soon as proper
handlers are set.
Fixes bug #74083
Fabien Villepinte [Sun, 20 Oct 2019 08:57:31 +0000 (10:57 +0200)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Sun, 20 Oct 2019 08:55:27 +0000 (10:55 +0200)]
Improve the error message in timeout tests
Closes GH-4818.
Fabien Villepinte [Sat, 19 Oct 2019 20:12:18 +0000 (22:12 +0200)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Sat, 19 Oct 2019 20:11:34 +0000 (22:11 +0200)]
Fix proto of enchant_broker_list_dicts()
Christoph M. Becker [Sat, 19 Oct 2019 17:20:25 +0000 (19:20 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix miscellaneous typos in docs
Tyson Andre [Sat, 19 Oct 2019 16:42:57 +0000 (12:42 -0400)]
Fix miscellaneous typos in docs
Fabien Villepinte [Sat, 19 Oct 2019 13:44:57 +0000 (15:44 +0200)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Sat, 19 Oct 2019 13:42:16 +0000 (15:42 +0200)]
Add tests for DOMEntityReference
Christoph M. Becker [Sat, 19 Oct 2019 10:59:59 +0000 (12:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78684: PCRE bug72463_2 test is sending emails on Linux
Christoph M. Becker [Sat, 19 Oct 2019 10:53:29 +0000 (12:53 +0200)]
Fix #78684: PCRE bug72463_2 test is sending emails on Linux
This test is not supposed to run on non Windows systems; otherwise it
would try to send an email.
Christoph M. Becker [Sat, 19 Oct 2019 09:52:38 +0000 (11:52 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78694: Appending to a variant array causes segfault
Christoph M. Becker [Sat, 19 Oct 2019 09:50:41 +0000 (11:50 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78694: Appending to a variant array causes segfault
Christoph M. Becker [Sat, 19 Oct 2019 09:48:40 +0000 (11:48 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78694: Appending to a variant array causes segfault
Christoph M. Becker [Sat, 19 Oct 2019 09:41:28 +0000 (11:41 +0200)]
Fix #78694: Appending to a variant array causes segfault
`write_dimension` object handlers have to be able to handle `NULL`
`offset`s; for now we simply throw an exception instead of following
the `NULL` pointer.