]>
granicus.if.org Git - php/log
Christoph M. Becker [Tue, 24 Nov 2020 12:39:15 +0000 (13:39 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
[ci skip] Update generate_patch.sh
Christoph M. Becker [Tue, 24 Nov 2020 12:35:15 +0000 (13:35 +0100)]
[ci skip] Update generate_patch.sh
This has apparently been forgotten when updating to libmagic 5.39.
Christoph M. Becker [Tue, 24 Nov 2020 12:11:00 +0000 (13:11 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #80366: Return Value of zend_fstat() not Checked
Christoph M. Becker [Tue, 24 Nov 2020 12:10:18 +0000 (13:10 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80366: Return Value of zend_fstat() not Checked
Christoph M. Becker [Tue, 17 Nov 2020 13:42:22 +0000 (14:42 +0100)]
Fix #80366: Return Value of zend_fstat() not Checked
In the somewhat unlikely case that `zend_fstat()` fails, we must not
proceed executing the function, but return `false` instead.
Patch based on the patch contributed by sagpant at microsoft dot com.
Closes GH-6432.
Nikita Popov [Tue, 24 Nov 2020 12:02:17 +0000 (13:02 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80362: Running dtrace scripts can cause php to crash
Nikita Popov [Tue, 24 Nov 2020 12:02:08 +0000 (13:02 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fixed bug #80362: Running dtrace scripts can cause php to crash
Nikita Popov [Tue, 24 Nov 2020 12:00:53 +0000 (13:00 +0100)]
Fixed bug #80362: Running dtrace scripts can cause php to crash
Patch by al at coralnet dot name.
Nikita Popov [Tue, 24 Nov 2020 10:46:03 +0000 (11:46 +0100)]
Use pkg-config for libargon2
We already tried this in PHP 7.4, but ran into issues, because
alpine did not support pkg-config for libargon2 (or had a broken
pc file, not sure). The Alpine issue has been resolved in the
meantime, so let's give this another try.
Nikita Popov [Tue, 24 Nov 2020 10:38:50 +0000 (11:38 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80404
Nikita Popov [Tue, 24 Nov 2020 10:31:53 +0000 (11:31 +0100)]
Fixed bug #80404
For a division like [1..1]/[2..2] produce [0..1] as a result, which
would be the integer envelope of the floating-point result.
The implementation is pretty ugly (we're now taking min/max across
eight values...) but I couldn't come up with a more elegant way
to handle this that doesn't make things a lot more complex (the
division sign handling is the annoying issue here).
Nikita Popov [Tue, 24 Nov 2020 09:10:01 +0000 (10:10 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80391
Nikita Popov [Tue, 24 Nov 2020 09:09:28 +0000 (10:09 +0100)]
Fixed bug #80391
Iterable was not considered a subtype of array|object, and thus
also not a subtype of mixed.
Nikita Popov [Tue, 24 Nov 2020 08:49:52 +0000 (09:49 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix PDOStatement::fetchObject() stub
Benjamin Morel [Mon, 23 Nov 2020 22:24:20 +0000 (23:24 +0100)]
Fix PDOStatement::fetchObject() stub
Closes GH-6449.
Christopher Jones [Mon, 23 Nov 2020 23:46:00 +0000 (10:46 +1100)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Sync README with package.xml
Christopher Jones [Mon, 23 Nov 2020 23:45:48 +0000 (10:45 +1100)]
Sync README with package.xml
Christoph M. Becker [Mon, 23 Nov 2020 23:23:55 +0000 (00:23 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix COMPersistHelper::__construct() stub
Christoph M. Becker [Mon, 23 Nov 2020 23:20:58 +0000 (00:20 +0100)]
Fix COMPersistHelper::__construct() stub
`$variant` is optional.
Gabriel Caruso [Fri, 20 Nov 2020 16:00:13 +0000 (17:00 +0100)]
[ci-skip] Use HTTPS for links on PHP ini files
Remi Collet [Mon, 23 Nov 2020 14:59:23 +0000 (15:59 +0100)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
zip extension is 1.19.2
Remi Collet [Mon, 23 Nov 2020 14:59:15 +0000 (15:59 +0100)]
zip extension is 1.19.2
Dmitry Stogov [Mon, 23 Nov 2020 13:19:54 +0000 (16:19 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
zend_jit_trace_stack_frame.stack can't be NULL
Dmitry Stogov [Mon, 23 Nov 2020 13:19:22 +0000 (16:19 +0300)]
zend_jit_trace_stack_frame.stack can't be NULL
Dmitry Stogov [Mon, 23 Nov 2020 11:43:04 +0000 (14:43 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed use-after-free in PHPUnit tests
Dmitry Stogov [Mon, 23 Nov 2020 11:42:38 +0000 (14:42 +0300)]
Fixed use-after-free in PHPUnit tests
Dmitry Stogov [Mon, 23 Nov 2020 09:08:23 +0000 (12:08 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Keep value of register before possible side exit
Dmitry Stogov [Mon, 23 Nov 2020 09:07:05 +0000 (12:07 +0300)]
Keep value of register before possible side exit
Christoph M. Becker [Sun, 22 Nov 2020 13:05:52 +0000 (14:05 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #77594: ob_tidyhandler is never reset
Christoph M. Becker [Sun, 22 Nov 2020 13:04:21 +0000 (14:04 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #77594: ob_tidyhandler is never reset
Christoph M. Becker [Sat, 14 Nov 2020 14:03:58 +0000 (15:03 +0100)]
Fix #77594: ob_tidyhandler is never reset
We reset to original INI value on request shutdown.
Closes GH-6425.
Máté Kocsis [Sat, 21 Nov 2020 22:17:55 +0000 (23:17 +0100)]
Merge branch 'PHP-8.0'
Máté Kocsis [Tue, 17 Nov 2020 19:13:42 +0000 (20:13 +0100)]
Remove some incorrect mixed parameter types
Nikita Popov [Fri, 20 Nov 2020 15:50:57 +0000 (16:50 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix typos in php.ini files
Nikita Popov [Fri, 20 Nov 2020 15:50:52 +0000 (16:50 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix typos in php.ini files
Benjamin Morel [Fri, 20 Nov 2020 13:45:35 +0000 (14:45 +0100)]
Fix typos in php.ini files
Closes GH-6441.
[ci skip]
Nikita Popov [Fri, 20 Nov 2020 15:49:14 +0000 (16:49 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
UPGRADING: (real) cast has been removed
Use MIN/MAX when dumping RANGE[]
jrfnl [Fri, 20 Nov 2020 01:20:03 +0000 (02:20 +0100)]
UPGRADING: (real) cast has been removed
.. but the removal wasn't mentioned in the `UPGRADING` docs yet.
Ref:
* https://github.com/php/php-src/pull/5220
* https://github.com/php/php-src/commit/
c9db32271a8083721582c5ec1dd09c4d4f562c74
Closes GH-6440.
[ci-skip]
Nikita Popov [Thu, 19 Nov 2020 11:46:52 +0000 (12:46 +0100)]
Use MIN/MAX when dumping RANGE[]
It's very common that one of the bounds is LONG_MIN or LONG_MAX.
Dump them as MIN/MAX instead of the int representation in that
case, as it makes the dump less noisy.
Dmitry Stogov [Fri, 20 Nov 2020 15:23:11 +0000 (18:23 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed incorrect TRACE_FRAME_MASK_NESTED flag setting
Dmitry Stogov [Fri, 20 Nov 2020 15:22:21 +0000 (18:22 +0300)]
Fixed incorrect TRACE_FRAME_MASK_NESTED flag setting
Dmitry Stogov [Fri, 20 Nov 2020 12:12:58 +0000 (15:12 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed 32-bit JIT
Dmitry Stogov [Fri, 20 Nov 2020 12:12:30 +0000 (15:12 +0300)]
Fixed 32-bit JIT
Christoph M. Becker [Thu, 19 Nov 2020 18:27:12 +0000 (19:27 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #72964: White space not unfolded for CC/Bcc headers
Christoph M. Becker [Thu, 19 Nov 2020 18:26:33 +0000 (19:26 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #72964: White space not unfolded for CC/Bcc headers
Christoph M. Becker [Tue, 10 Nov 2020 15:13:54 +0000 (16:13 +0100)]
Fix #72964: White space not unfolded for CC/Bcc headers
`\r\n` does only terminate a header, if not followed by `\t` or ` `.
We have to cater to that when determining the end position of the
respective headers.
Closes GH-6420.
Christoph M. Becker [Thu, 19 Nov 2020 15:28:27 +0000 (16:28 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION
Christoph M. Becker [Thu, 19 Nov 2020 15:26:14 +0000 (16:26 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION
Christoph M. Becker [Tue, 10 Nov 2020 12:51:40 +0000 (13:51 +0100)]
Fix #80345: PHPIZE configuration has outdated PHP_RELEASE_VERSION
We must not redefine the version "constants" for phpize builds, because
these have already generated in phpize.js, from where we pass these
variables forward to configure.js.
We also add `PHP_EXTRA_VERSION` and `PHP_VERSION_STRING` to the files
for completeness.
Closes GH-6419.
Sara Golemon [Thu, 19 Nov 2020 14:38:31 +0000 (14:38 +0000)]
Merge branch 'PHP-8.0'
* PHP-8.0:
8.0 branch should be prepping for 8.0.1
Sara Golemon [Thu, 19 Nov 2020 14:37:44 +0000 (14:37 +0000)]
8.0 branch should be prepping for 8.0.1
Sara Golemon [Thu, 19 Nov 2020 14:34:47 +0000 (14:34 +0000)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Prepare NEWS file for GA
Sara Golemon [Thu, 19 Nov 2020 14:27:49 +0000 (14:27 +0000)]
Prepare NEWS file for GA
Dmitry Stogov [Thu, 19 Nov 2020 09:32:49 +0000 (12:32 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Added missing deoptimization code for trampoline handling
Dmitry Stogov [Thu, 19 Nov 2020 09:32:36 +0000 (12:32 +0300)]
Added missing deoptimization code for trampoline handling
Nikita Popov [Thu, 19 Nov 2020 09:30:38 +0000 (10:30 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Export zend_is_callable_at_frame
Nikita Popov [Thu, 19 Nov 2020 09:29:32 +0000 (10:29 +0100)]
Export zend_is_callable_at_frame
Export the zend_is_callable_impl() function as
zend_is_callable_at_frame() for use by extension. As twose pointed
out, an extension may want to retrieve fcc for a private method.
Nikita Popov [Thu, 19 Nov 2020 09:18:10 +0000 (10:18 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix curl_multi_getcontent() parameter name
Nikita Popov [Wed, 18 Nov 2020 15:43:45 +0000 (16:43 +0100)]
Fix curl_multi_getcontent() parameter name
While the function name starts with curl_multi_*, the function
actually accepts a CurlHandle. As such, it should also use just
$handle as the parameter name.
Closes GH-6435.
Christoph M. Becker [Sun, 4 Oct 2020 10:50:58 +0000 (12:50 +0200)]
Fix inclusion order for phpize builds on Windows
`configure` for `phpize` builds on Windows creates Makefile and
config.pickle.h and includes the latter via the command line option
`/FI`. That implies that config.pickle.h is always included before
config.w32.h, which means that standard definitions always override
extension specific definitions, while it should be the other way round.
Therefore, we change the inclusion order by including config.pickle.h
at the end of config.w32.h if the former is available, and also make
sure to avoid any potential C4005 warnings by `#undef`ining the macros
before defining them.
Closes GH-6269.
Nikita Popov [Wed, 18 Nov 2020 11:46:32 +0000 (12:46 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Short-circuit get_gc for currently running generator
Nikita Popov [Wed, 18 Nov 2020 11:46:12 +0000 (12:46 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Short-circuit get_gc for currently running generator
Nikita Popov [Wed, 18 Nov 2020 11:44:31 +0000 (12:44 +0100)]
Short-circuit get_gc for currently running generator
Dmitry Stogov [Wed, 18 Nov 2020 07:22:41 +0000 (10:22 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed register clobbering
Dmitry Stogov [Wed, 18 Nov 2020 07:22:25 +0000 (10:22 +0300)]
Fixed register clobbering
Dmitry Stogov [Tue, 17 Nov 2020 20:56:39 +0000 (23:56 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed trampoline handling
Dmitry Stogov [Tue, 17 Nov 2020 20:56:05 +0000 (23:56 +0300)]
Fixed trampoline handling
Dmitry Stogov [Tue, 17 Nov 2020 20:54:48 +0000 (23:54 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Update NEWS for 8.0.0
Update NEWS for PHP 8.0.0RC5
Gabriel Caruso [Tue, 17 Nov 2020 16:34:55 +0000 (16:34 +0000)]
Update NEWS for 8.0.0
Gabriel Caruso [Tue, 17 Nov 2020 16:23:11 +0000 (16:23 +0000)]
Update NEWS for PHP 8.0.0RC5
Dmitry Stogov [Tue, 17 Nov 2020 15:32:01 +0000 (18:32 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed allocated register clobbering
Dmitry Stogov [Tue, 17 Nov 2020 15:31:14 +0000 (18:31 +0300)]
Fixed allocated register clobbering
Dmitry Stogov [Tue, 17 Nov 2020 13:24:44 +0000 (16:24 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed false pasitive ASAN NULL pointer dereference warning
Dmitry Stogov [Tue, 17 Nov 2020 13:23:30 +0000 (16:23 +0300)]
Fixed false pasitive ASAN NULL pointer dereference warning
Nikita Popov [Tue, 17 Nov 2020 12:16:32 +0000 (13:16 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #80312: change default engine from MyISAM to InnoDB in tests
Nikita Popov [Tue, 17 Nov 2020 12:16:17 +0000 (13:16 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80312: change default engine from MyISAM to InnoDB in tests
Darek Slusarczyk [Fri, 6 Nov 2020 14:41:15 +0000 (15:41 +0100)]
Fix #80312: change default engine from MyISAM to InnoDB in tests
Change mysqli and pdo_mysql tests configuration to use by default
InnoDB instead of MyISAM.
Closes GH-6405.
Nikita Popov [Tue, 17 Nov 2020 09:54:38 +0000 (10:54 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80370: Segmentation fault reflecting attributes of dynamic property
Benjamin Eberlei [Sun, 15 Nov 2020 07:45:26 +0000 (08:45 +0100)]
Fixed bug #80370: Segmentation fault reflecting attributes of dynamic property
Closes GH-6428.
Nikita Popov [Tue, 17 Nov 2020 09:30:20 +0000 (10:30 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Provide unused retvals to observers
Sammy Kaye Powers [Wed, 11 Nov 2020 22:25:39 +0000 (14:25 -0800)]
Provide unused retvals to observers
Make sure that the return value is available to observers, even if
it is not used by the caller.
Closes GH-6422.
Nikita Popov [Tue, 17 Nov 2020 09:20:52 +0000 (10:20 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix incorrectly optimized out live range
Nikita Popov [Tue, 17 Nov 2020 09:20:23 +0000 (10:20 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix incorrectly optimized out live range
Nikita Popov [Tue, 17 Nov 2020 09:18:37 +0000 (10:18 +0100)]
Fix incorrectly optimized out live range
For x ? y : z style structures, the live range starts at z, but
may also hold the value of y. Make sure that the refcounting check
takes this into account, by checking the type of a potential phi
user.
Sammy Kaye Powers [Mon, 16 Nov 2020 23:13:29 +0000 (15:13 -0800)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fire open observer end handlers after a zend_bailout
Sammy Kaye Powers [Fri, 23 Oct 2020 18:43:31 +0000 (11:43 -0700)]
Fire open observer end handlers after a zend_bailout
Closes GH-6377
Dmitry Stogov [Mon, 16 Nov 2020 15:17:17 +0000 (18:17 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed MAY_BE_INDIRECT inference
Dmitry Stogov [Mon, 16 Nov 2020 15:17:05 +0000 (18:17 +0300)]
Fixed MAY_BE_INDIRECT inference
Christoph M. Becker [Mon, 16 Nov 2020 13:34:52 +0000 (14:34 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #74558: Can't rebind closure returned by Closure::fromCallable()
Christoph M. Becker [Mon, 16 Nov 2020 13:33:45 +0000 (14:33 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #74558: Can't rebind closure returned by Closure::fromCallable()
Christoph M. Becker [Thu, 12 Nov 2020 14:37:51 +0000 (15:37 +0100)]
Fix #74558: Can't rebind closure returned by Closure::fromCallable()
Failure to rebind such closures is not necessarily related to them
being created by `ReflectionFunctionAbstract::getClosure()`, so we fix
the error message.
Closes GH-6424.
Dmitry Stogov [Mon, 16 Nov 2020 13:11:48 +0000 (16:11 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed alias handling
Dmitry Stogov [Mon, 16 Nov 2020 13:11:25 +0000 (16:11 +0300)]
Fixed alias handling
Dmitry Stogov [Mon, 16 Nov 2020 11:52:18 +0000 (14:52 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed reference-counting
Fixed incorrect FETCH_THIS optimization
Dmitry Stogov [Mon, 16 Nov 2020 11:51:55 +0000 (14:51 +0300)]
Fixed reference-counting
Dmitry Stogov [Mon, 16 Nov 2020 11:51:39 +0000 (14:51 +0300)]
Fixed incorrect FETCH_THIS optimization
Dmitry Stogov [Mon, 16 Nov 2020 10:21:03 +0000 (13:21 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed inconsistent VM stack state
Dmitry Stogov [Mon, 16 Nov 2020 10:19:44 +0000 (13:19 +0300)]
Fixed inconsistent VM stack state
Dmitry Stogov [Mon, 16 Nov 2020 09:06:09 +0000 (12:06 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Trampoline cleanup
Dmitry Stogov [Mon, 16 Nov 2020 09:05:45 +0000 (12:05 +0300)]
Trampoline cleanup