]>
granicus.if.org Git - php/log
Nikita Popov [Tue, 24 Nov 2020 14:52:41 +0000 (15:52 +0100)]
Fixed bug #80377
Make sure the $PHP_THREAD_SAFETY variable is always available
when configuring extensions. It was previously available for
phpized extensions, but for in-tree builds it was being set
too late.
Then, use $PHP_THREAD_SAFETY instead of $enable_zts to check for
ZTS in bundled extensions, which makes sure these checks also
work for phpize builds.
Christopher Jones [Wed, 25 Nov 2020 05:42:12 +0000 (16:42 +1100)]
Fix test diff
Dmitry Stogov [Wed, 25 Nov 2020 00:49:42 +0000 (03:49 +0300)]
Use diferent temporary register (%r0 may keep a method address)
Dmitry Stogov [Tue, 24 Nov 2020 22:10:26 +0000 (01:10 +0300)]
Revert "Fixed bug #80377"
This reverts commit
fc26ad9b1220fdfd7db15ecaff5e7c38283c55b6 .
Florian Engelhardt [Tue, 24 Nov 2020 15:48:17 +0000 (16:48 +0100)]
[ci skip] Fix misspelled method names
Closes GH-6452.
Nikita Popov [Tue, 24 Nov 2020 15:42:52 +0000 (16:42 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix usage of casted string in ReflectionParameter ctor
Nikita Popov [Tue, 24 Nov 2020 15:41:18 +0000 (16:41 +0100)]
Fix usage of casted string in ReflectionParameter ctor
Fixes oss-fuzz #27755.
Nikita Popov [Tue, 24 Nov 2020 14:52:41 +0000 (15:52 +0100)]
Fixed bug #80377
Use $PHP_THREAD_SAFETY instead of $enable_zts to check for ZTS.
This variable is also available for phpize builds, while enable_zts
is only present for in-tree builds.
Nikita Popov [Tue, 24 Nov 2020 14:27:35 +0000 (15:27 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fixed bug #80393
Nikita Popov [Tue, 24 Nov 2020 14:26:40 +0000 (15:26 +0100)]
Fixed bug #80393
Handle macos versions that don't start with 10.* in libtool.
Patch by kir dot morozov at gmail dot com.
Christoph M. Becker [Thu, 19 Nov 2020 14:42:01 +0000 (15:42 +0100)]
Allow PHP_CURL_APIs to be imported by DLLs
Closes GH-6438.
Christoph M. Becker [Tue, 24 Nov 2020 13:06:19 +0000 (14:06 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #77961: finfo_open crafted magic parsing SIGABRT
Christoph M. Becker [Mon, 23 Nov 2020 16:12:46 +0000 (17:12 +0100)]
Fix #77961: finfo_open crafted magic parsing SIGABRT
libmagic may abort the running process, which is not desirable for PHP;
we raise a fatal error instead.
Closes GH-6437.
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: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: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: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: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.
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:45:48 +0000 (10:45 +1100)]
Sync README with package.xml
Christoph M. Becker [Mon, 23 Nov 2020 23:20:58 +0000 (00:20 +0100)]
Fix COMPersistHelper::__construct() stub
`$variant` is optional.
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:22 +0000 (16:19 +0300)]
zend_jit_trace_stack_frame.stack can't be NULL
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:07:05 +0000 (12:07 +0300)]
Keep value of register before possible side exit
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 [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: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]
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:22:21 +0000 (18:22 +0300)]
Fixed incorrect TRACE_FRAME_MASK_NESTED flag setting
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: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: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:37:44 +0000 (14:37 +0000)]
8.0 branch should be prepping for 8.0.1
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:36 +0000 (12:32 +0300)]
Added missing deoptimization code for trampoline handling
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 [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.
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:25 +0000 (10:22 +0300)]
Fixed register clobbering
Dmitry Stogov [Tue, 17 Nov 2020 20:56:05 +0000 (23:56 +0300)]
Fixed trampoline handling
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:31:14 +0000 (18:31 +0300)]
Fixed allocated register clobbering
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: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.
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.
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: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 [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:05 +0000 (18:17 +0300)]
Fixed MAY_BE_INDIRECT inference
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:25 +0000 (16:11 +0300)]
Fixed alias handling
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:19:44 +0000 (13:19 +0300)]
Fixed inconsistent VM stack state
Dmitry Stogov [Mon, 16 Nov 2020 09:05:45 +0000 (12:05 +0300)]
Trampoline cleanup
Pavel Djundik [Sat, 14 Nov 2020 11:12:38 +0000 (13:12 +0200)]
[ci skip] Add note that imagedestroy() no longer has an effect
Closes GH-6427.
Nikita Popov [Fri, 13 Nov 2020 13:55:26 +0000 (14:55 +0100)]
Inline pair production in json parser
Having this as a separate production has a noticeable performance
impact, and doesn't really make things clearer either.
Christoph M. Becker [Thu, 12 Nov 2020 13:58:47 +0000 (14:58 +0100)]
Strip trailing line breaks and periods from Windows error messages
PHP error messages should not contain line breaks, so we remove these
from the Windows specific error messages. We also remove trailing
periods for the same reason.
Closes GH-6423.
Nikita Popov [Thu, 12 Nov 2020 14:09:18 +0000 (15:09 +0100)]
Don't assume libmysqlclient library name
By simply dropping the additional checks, in line with the general
guideline of trusting the output of config scripts (this should
be migrated to pkg-config though).
Also drop the code for manually adding -z if mysql_config does not
-- that's not our problem.
Nikita Popov [Thu, 12 Nov 2020 11:18:33 +0000 (12:18 +0100)]
Fix memory leak when user filter onCreate returns false
Nikita Popov [Thu, 12 Nov 2020 10:37:54 +0000 (11:37 +0100)]
Fix memory leak with bcsqrt on number 0<X<1
Nikita Popov [Thu, 12 Nov 2020 10:02:04 +0000 (11:02 +0100)]
Fix reflection getDefaultValue() with user arg info
The default value is part of the op_array in that case, but we have
no way to access it. Fail gracefully.
Dmitry Stogov [Wed, 11 Nov 2020 17:13:58 +0000 (20:13 +0300)]
Fixed incorrectly eliminated type store
Dmitry Stogov [Wed, 11 Nov 2020 15:34:16 +0000 (18:34 +0300)]
Remove assertion
Nikita Popov [Wed, 11 Nov 2020 15:03:10 +0000 (16:03 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Handle errors during next_result()
Nikita Popov [Wed, 11 Nov 2020 14:56:05 +0000 (15:56 +0100)]
Handle errors during next_result()
Dmitry Stogov [Wed, 11 Nov 2020 14:34:46 +0000 (17:34 +0300)]
Fixed incorrect invariant guard motion
Dmitry Stogov [Wed, 11 Nov 2020 11:54:54 +0000 (14:54 +0300)]
Stop on fake frame
Dmitry Stogov [Wed, 11 Nov 2020 11:54:00 +0000 (14:54 +0300)]
Fixed reference-counting propagation
Nikita Popov [Wed, 11 Nov 2020 11:48:25 +0000 (12:48 +0100)]
Fix double free when socket_accept fails
Nikita Popov [Wed, 11 Nov 2020 10:51:20 +0000 (11:51 +0100)]
Retain reference to share handle from curl handle
Not keeping a reference will not result in use after free, because
curl protects against it, but it will result in a memory leak,
because curl_share_cleanup() will fail. We should make sure that
the share handle object stays alive as long as the curl handles
use it.
Dmitry Stogov [Wed, 11 Nov 2020 10:50:53 +0000 (13:50 +0300)]
[Observer+JIT] Save opline before calling begin/end handlers
Dmitry Stogov [Wed, 11 Nov 2020 10:06:55 +0000 (13:06 +0300)]
[Observer] Save opline before calling begin/end handlers
Nikita Popov [Wed, 11 Nov 2020 08:28:20 +0000 (09:28 +0100)]
Fix community job
Made a mistake while merging...
Derick Rethans [Tue, 10 Nov 2020 17:58:38 +0000 (17:58 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Derick Rethans [Tue, 10 Nov 2020 17:58:21 +0000 (17:58 +0000)]
PHP-7.4 is now for 7.4.14
Gabriel Caruso [Tue, 10 Nov 2020 11:02:35 +0000 (11:02 +0000)]
Update NEWS for 8.0.0
Gabriel Caruso [Tue, 10 Nov 2020 10:52:13 +0000 (10:52 +0000)]
Update NEWS for PHP 8.0.0RC4
Nikita Popov [Tue, 10 Nov 2020 10:45:59 +0000 (11:45 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add integration test for symfony preloading
Nikita Popov [Mon, 9 Nov 2020 14:13:33 +0000 (15:13 +0100)]
Add integration test for symfony preloading
To help catch regressions like the one that occurred in PHP 7.4.12.
Closes GH-6414.
Christoph M. Becker [Tue, 10 Nov 2020 10:11:06 +0000 (11:11 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
7.3.26 is next
Christoph M. Becker [Tue, 10 Nov 2020 10:09:40 +0000 (11:09 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
7.3.26 is next
Christoph M. Becker [Tue, 10 Nov 2020 10:08:16 +0000 (11:08 +0100)]
7.3.26 is next
Nikita Popov [Mon, 9 Nov 2020 16:08:38 +0000 (17:08 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix phi use chain management when renaming variable
Nikita Popov [Mon, 9 Nov 2020 16:06:41 +0000 (17:06 +0100)]
Fix phi use chain management when renaming variable
If there is a previous use of the new variable in the phi, we need
to NULL out the use chain of the new source we're adding.
Test case is reduced from an assertion failure in the Symfony Demo.
Nikita Popov [Mon, 9 Nov 2020 13:44:11 +0000 (14:44 +0100)]
Use true/false instead of TRUE/FALSE in intl
And drop the U_DEFINE_TRUE_AND_FALSE flag.
Nikita Popov [Mon, 9 Nov 2020 13:35:40 +0000 (14:35 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fixed bug #80310: Support for icu4c 68.1.