]>
granicus.if.org Git - php/log
Nikita Popov [Tue, 28 May 2019 11:07:03 +0000 (13:07 +0200)]
hebrev/hebrevc: Don't return false for empty string
There is nothing special about the empty string in this context,
we should pass it through unchanged.
Nikita Popov [Tue, 28 May 2019 11:03:41 +0000 (13:03 +0200)]
Update MAY_BE_NULL info for more ext/standard functions
Dmitry Stogov [Tue, 28 May 2019 10:35:29 +0000 (13:35 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid double copying
Dmitry Stogov [Tue, 28 May 2019 10:35:00 +0000 (13:35 +0300)]
Avoid double copying
Nikita Popov [Tue, 28 May 2019 10:11:32 +0000 (12:11 +0200)]
Update MAY_BE_NULL for parts of ext/standard
Also update proto comments to be more accurate.
Nikita Popov [Tue, 28 May 2019 09:42:40 +0000 (11:42 +0200)]
Update MAY_BE_NULL func_info for Zend functions
These cannot return NULL anymore in PHP 8.
Dmitry Stogov [Tue, 28 May 2019 09:39:13 +0000 (12:39 +0300)]
Fixed register allocation
Nikita Popov [Tue, 28 May 2019 09:21:24 +0000 (11:21 +0200)]
Remove FUNC_MAY_WARN
We are no longer constructing the local symbol table when calling
error handlers since
2f1f34952e9a0dfb3adcbec82ba69f4ac82b3a3d ,
which was the original motivation for having this information and
was used in an earlier version of the JIT.
Nikita Popov [Tue, 28 May 2019 09:15:37 +0000 (11:15 +0200)]
Merge branch 'PHP-7.4'
Dik Takken [Thu, 16 May 2019 20:08:08 +0000 (22:08 +0200)]
Allow array_merge() / array_merge_recursive() without arguments
This allows writing
array_merge(...$arrays)
instead of
array_merge([], ...$arrays)
and is in line with similar changes to array_push() and array_unshift()
in PHP 7.3.
Closes GH-4175.
Nikita Popov [Tue, 28 May 2019 09:01:10 +0000 (11:01 +0200)]
Add return type information to some ext/standard functions
Just the first few functions in basic_functions.c to get started.
If anyone is interested in continuing this, PRs to add type info
will be accepted against master, with the following caveats:
* Return types only, we are not ready to add argument types yet.
* Only for functions. For methods the addition of return types is
BC breaking and needs to be carefully considered.
* Only in cases where we can actually express the return type, we
don't have int|false and similar.
Nikita Popov [Tue, 28 May 2019 08:22:51 +0000 (10:22 +0200)]
zend_func_info: Remove unnecessary type callbacks
In PHP 8 these functions will throw on invalid arguments, so there
is no need to distinguish the error cases.
Dmitry Stogov [Tue, 28 May 2019 08:04:47 +0000 (11:04 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Put phpinfo() related code into cold code segment
Dmitry Stogov [Tue, 28 May 2019 08:04:13 +0000 (11:04 +0300)]
Put phpinfo() related code into cold code segment
Joe Watkins [Tue, 28 May 2019 07:55:18 +0000 (09:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
bump version after release
Joe Watkins [Tue, 28 May 2019 07:54:47 +0000 (09:54 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
bump version after release
Joe Watkins [Tue, 28 May 2019 07:54:15 +0000 (09:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
bump version after release
Joe Watkins [Tue, 28 May 2019 07:53:32 +0000 (09:53 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
bump version after release
Joe Watkins [Tue, 28 May 2019 07:52:52 +0000 (09:52 +0200)]
bump version after release
Stanislav Malyshev [Tue, 28 May 2019 04:36:15 +0000 (21:36 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
Stanislav Malyshev [Tue, 28 May 2019 04:36:10 +0000 (21:36 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
Stanislav Malyshev [Tue, 28 May 2019 04:36:05 +0000 (21:36 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
Stanislav Malyshev [Tue, 28 May 2019 04:36:00 +0000 (21:36 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
Stanislav Malyshev [Tue, 28 May 2019 01:04:00 +0000 (18:04 -0700)]
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
Stanislav Malyshev [Tue, 28 May 2019 00:28:34 +0000 (17:28 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
Stanislav Malyshev [Tue, 28 May 2019 00:28:29 +0000 (17:28 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
Stanislav Malyshev [Tue, 28 May 2019 00:28:25 +0000 (17:28 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
Stanislav Malyshev [Tue, 28 May 2019 00:28:20 +0000 (17:28 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
Stanislav Malyshev [Tue, 28 May 2019 00:16:29 +0000 (17:16 -0700)]
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
Stanislav Malyshev [Tue, 28 May 2019 00:21:32 +0000 (17:21 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix function name
Stanislav Malyshev [Tue, 28 May 2019 00:21:28 +0000 (17:21 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix function name
Stanislav Malyshev [Tue, 28 May 2019 00:21:23 +0000 (17:21 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix function name
Stanislav Malyshev [Tue, 28 May 2019 00:20:56 +0000 (17:20 -0700)]
Fix function name
Stanislav Malyshev [Mon, 27 May 2019 23:49:37 +0000 (16:49 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973: Uninitialized read in gdImageCreateFromXbm
Stanislav Malyshev [Mon, 27 May 2019 23:49:31 +0000 (16:49 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973: Uninitialized read in gdImageCreateFromXbm
Stanislav Malyshev [Mon, 27 May 2019 23:49:25 +0000 (16:49 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973: Uninitialized read in gdImageCreateFromXbm
Stanislav Malyshev [Mon, 27 May 2019 23:49:19 +0000 (16:49 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973: Uninitialized read in gdImageCreateFromXbm
Stanislav Malyshev [Mon, 27 May 2019 23:48:32 +0000 (16:48 -0700)]
Update NEWS
Stanislav Malyshev [Mon, 27 May 2019 23:32:42 +0000 (16:32 -0700)]
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Christoph M. Becker [Mon, 6 May 2019 08:18:51 +0000 (10:18 +0200)]
Fix #77973: Uninitialized read in gdImageCreateFromXbm
We have to ensure that `sscanf()` does indeed read a hex value here,
and bail out otherwise.
Christoph M. Becker [Mon, 27 May 2019 16:43:18 +0000 (18:43 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent parallel test conflicts
Christoph M. Becker [Mon, 27 May 2019 14:20:50 +0000 (16:20 +0200)]
Prevent parallel test conflicts
These ports are already used by another test, so we change them.
Nikita Popov [Mon, 27 May 2019 15:44:55 +0000 (17:44 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 27 May 2019 15:44:11 +0000 (17:44 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 27 May 2019 15:42:50 +0000 (17:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Michael Maroszek [Mon, 27 May 2019 15:42:20 +0000 (17:42 +0200)]
Fixed bug #76345
Nikita Popov [Mon, 27 May 2019 15:16:56 +0000 (17:16 +0200)]
Remove special handling of zero-arg funcs in func_info
In PHP 8 we always throw on zpp failure, so we can always return the
type for the valid argument case only. We'll want to also adjust the
return type listings based on that (and drop MAY_BE_NULL/MAY_BE_FALSE
where possible).
Nikita Popov [Mon, 27 May 2019 15:13:00 +0000 (17:13 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 27 May 2019 15:11:44 +0000 (17:11 +0200)]
BIND_STATIC of implicit binding may be undef
Even though we don't need it at runtime, add the BIND_IMPLICIT
flag to BIND_STATIC as well, so we can distinguish this case in
type inference.
This fixes a JIT miscompile in arrow_functions/002.phpt.
Nikita Popov [Mon, 27 May 2019 14:15:08 +0000 (16:15 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 27 May 2019 14:15:03 +0000 (16:15 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 27 May 2019 14:09:58 +0000 (16:09 +0200)]
Func info: Fix calls to zero-arg varargs
The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175.
Nikita Popov [Mon, 27 May 2019 14:14:25 +0000 (16:14 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 27 May 2019 14:14:16 +0000 (16:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 27 May 2019 14:09:58 +0000 (16:09 +0200)]
Func info: Fix calls to zero-arg varargs
The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175.
Dmitry Stogov [Mon, 27 May 2019 13:20:30 +0000 (16:20 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable pcre valgrind support only in DEBUG build (it affects performance)
Dmitry Stogov [Mon, 27 May 2019 13:20:20 +0000 (16:20 +0300)]
Enable pcre valgrind support only in DEBUG build (it affects performance)
Nikita Popov [Mon, 27 May 2019 13:16:57 +0000 (15:16 +0200)]
Merge branch 'PHP-7.4'
Hugh McMaster [Sun, 26 May 2019 09:30:54 +0000 (19:30 +1000)]
ext/xml: Use PKG_CHECK_MODULES to detect the Expat library
Dmitry Stogov [Mon, 27 May 2019 10:38:07 +0000 (13:38 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Align .text segment for better huge pages usage
Dmitry Stogov [Mon, 27 May 2019 10:37:19 +0000 (13:37 +0300)]
Align .text segment for better huge pages usage
Christoph M. Becker [Mon, 27 May 2019 08:52:25 +0000 (10:52 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Make more tests run on Windows
Gabriel Caruso [Mon, 27 May 2019 01:30:05 +0000 (22:30 -0300)]
Make more tests run on Windows
Nikita Popov [Mon, 27 May 2019 07:38:33 +0000 (09:38 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 24 May 2019 12:41:38 +0000 (14:41 +0200)]
Accept flags argument in zend_lookup_class_ex()
Instead of a single boolean, so we have space for extension here.
Jakub Zelenka [Sun, 26 May 2019 17:51:39 +0000 (18:51 +0100)]
Merge branch 'PHP-7.4'
Jakub Zelenka [Sun, 26 May 2019 17:51:10 +0000 (18:51 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Jakub Zelenka [Sun, 26 May 2019 17:49:52 +0000 (18:49 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 26 May 2019 17:47:22 +0000 (18:47 +0100)]
Add fpmi to the opcache supported sapis
Anatol Belski [Sat, 25 May 2019 09:42:14 +0000 (11:42 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Upgrade bundled PCRE2 to 10.33
Anatol Belski [Sat, 25 May 2019 09:33:39 +0000 (11:33 +0200)]
Upgrade bundled PCRE2 to 10.33
Joe Watkins [Sat, 25 May 2019 07:04:37 +0000 (09:04 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use PKG_CHECK_MODULES to detect valgrind, and share build config with pcre
Hugh McMaster [Thu, 23 May 2019 13:01:04 +0000 (23:01 +1000)]
Use PKG_CHECK_MODULES to detect valgrind, and share build config with pcre
Joe Watkins [Sat, 25 May 2019 06:12:43 +0000 (08:12 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Define minimum required libffi version
Peter Kokot [Wed, 8 May 2019 21:32:20 +0000 (23:32 +0200)]
Define minimum required libffi version
Nikita Popov [Fri, 24 May 2019 09:02:03 +0000 (11:02 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 24 May 2019 08:58:33 +0000 (10:58 +0200)]
Add UPGRADING/NEWS entries
Nikita Popov [Fri, 24 May 2019 07:49:44 +0000 (09:49 +0200)]
Deprecate use of parent where no parent exists
This deprecation is part of the covariance RFC.
Christoph M. Becker [Fri, 24 May 2019 08:23:12 +0000 (10:23 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
list net/interfaces, trying to get the error on windows when possible
David Carlier [Wed, 22 May 2019 22:04:56 +0000 (00:04 +0200)]
list net/interfaces, trying to get the error on windows when possible
Nikita Popov [Fri, 24 May 2019 07:37:39 +0000 (09:37 +0200)]
Split up "parent" test cases
As the warnings are fatal errors in PHP 8, we can't test all of this
in a single file anymore.
Nikita Popov [Fri, 24 May 2019 07:33:58 +0000 (09:33 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 8 May 2019 10:30:16 +0000 (12:30 +0200)]
Implement basic variance support
This is a minimal variance implementation: It does not support any
cyclic type dependencies. Additionally the preloading requirements
are much more restrictive than necessary. Hopefully we can relax
these in the future.
Nikita Popov [Thu, 9 May 2019 08:41:06 +0000 (10:41 +0200)]
Avoid early-binding on unresolved types
Fixes bug #76451, and more importantly lays necessary groundwork for
covariant/contravariant types. Bug #76451 is just an edge case, but
once covariance is introduced this will become a common problem instead.
Nikita Popov [Thu, 23 May 2019 11:41:26 +0000 (13:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 23 May 2019 11:41:17 +0000 (13:41 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 23 May 2019 10:29:08 +0000 (12:29 +0200)]
Fix bug #77955
Free metadata before freeing the arena. I don't have a repro script,
but the added assertion fails for many existing tests prior to this
change.
Christoph M. Becker [Thu, 23 May 2019 11:14:38 +0000 (13:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent further potential test conflicts
Christoph M. Becker [Thu, 23 May 2019 11:09:14 +0000 (13:09 +0200)]
Prevent further potential test conflicts
These tests partially use the same resource names; as a quick-fix we're
marking them all as conflicting.
Joe Watkins [Thu, 23 May 2019 11:09:33 +0000 (13:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix notice in run-tests
Joe Watkins [Thu, 23 May 2019 11:09:18 +0000 (13:09 +0200)]
fix notice in run-tests
Christoph M. Becker [Thu, 23 May 2019 09:41:18 +0000 (11:41 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent potential test conflict
Christoph M. Becker [Thu, 23 May 2019 09:40:39 +0000 (11:40 +0200)]
Prevent potential test conflict
bug48746_tmp.lnk is also created by bug48746_2.phpt which might clash,
if both are run simultaneouly.
Nikita Popov [Thu, 23 May 2019 09:13:22 +0000 (11:13 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 23 May 2019 09:13:14 +0000 (11:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 23 May 2019 09:12:34 +0000 (11:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 23 May 2019 09:11:54 +0000 (11:11 +0200)]
Fixed bug #78038 socket_select with references
Joe Watkins [Thu, 23 May 2019 08:59:03 +0000 (10:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
run-tests improvements: Add XLEAK section, this is made necessary by the support for valgrind tools other than memcheck. XLEAK is to a leaking test what XFAIL is to a failing test. Tidy up summary a little to exclude Expected Fail and Expected Leak when there are no expected fail/leaks
Joe Watkins [Thu, 23 May 2019 08:55:25 +0000 (10:55 +0200)]
run-tests improvements:
Add XLEAK section, this is made necessary by the support
for valgrind tools other than memcheck.
XLEAK is to a leaking test what XFAIL is to a failing test.
Tidy up summary a little to exclude Expected Fail and Expected Leak
when there are no expected fail/leaks
Nikita Popov [Thu, 23 May 2019 08:41:27 +0000 (10:41 +0200)]
Merge branch 'PHP-7.4'