]>
granicus.if.org Git - php/log
Alex Dowad [Mon, 16 Nov 2020 19:16:24 +0000 (21:16 +0200)]
Bugfixes for findInvalidChars (helper for mbstring test suite)
Nikita Popov [Wed, 25 Nov 2020 16:28:38 +0000 (17:28 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Add UPGRADING note for PDO::inTransaction()
[ci skip]
Nikita Popov [Wed, 25 Nov 2020 16:28:23 +0000 (17:28 +0100)]
Add UPGRADING note for PDO::inTransaction()
[ci skip]
Nikita Popov [Wed, 25 Nov 2020 16:25:08 +0000 (17:25 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80411
Nikita Popov [Wed, 25 Nov 2020 16:24:49 +0000 (17:24 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fixed bug #80411
Nikita Popov [Wed, 25 Nov 2020 16:23:42 +0000 (17:23 +0100)]
Fixed bug #80411
References to null-serializations are stored as null, and as such
are part of the reference count.
Reminds me that we really need to deprecate the mess that is
Serializable.
Nikita Popov [Wed, 25 Nov 2020 16:05:25 +0000 (17:05 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix unserialization ref source management, again
Nikita Popov [Wed, 25 Nov 2020 16:04:07 +0000 (17:04 +0100)]
Fix unserialization ref source management, again
Handle one case the previous patch did not account for: If
unserialization of data fails, we should still register a ref
source.
Also add an extra test for a reference between two typed properties,
as this used to be handled incorrectly earlier.
Nikita Popov [Wed, 25 Nov 2020 15:29:22 +0000 (16:29 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed error reporting in mysqli_stmt::__construct
Nikita Popov [Wed, 25 Nov 2020 15:29:00 +0000 (16:29 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fixed error reporting in mysqli_stmt::__construct
Dharman [Tue, 24 Nov 2020 23:02:04 +0000 (23:02 +0000)]
Fixed error reporting in mysqli_stmt::__construct
For the sake of simplicity, I've synchronized the implementation
with PHP 8, which means null values are also accepted.
Closes GH-6454.
Nikita Popov [Wed, 25 Nov 2020 15:08:36 +0000 (16:08 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix phpt reindentation in tidy script
Reindent more mysqli tests
Nikita Popov [Wed, 25 Nov 2020 15:08:28 +0000 (16:08 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Reindent more mysqli tests
Nikita Popov [Wed, 25 Nov 2020 15:07:56 +0000 (16:07 +0100)]
Fix phpt reindentation in tidy script
This was missing adjacent SKIPIF/FILE/CLEAN sections.
Nikita Popov [Wed, 25 Nov 2020 15:07:16 +0000 (16:07 +0100)]
Reindent more mysqli tests
Due to a bug in the tidy script, most tests did not actually get
reindented...
Nikita Popov [Wed, 25 Nov 2020 14:58:39 +0000 (15:58 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Reindent ext/mysqli tests
Allow running tidy.php on specific directory
Nikita Popov [Wed, 25 Nov 2020 14:58:21 +0000 (15:58 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Reindent ext/mysqli tests
Nikita Popov [Wed, 25 Nov 2020 14:57:11 +0000 (15:57 +0100)]
Reindent ext/mysqli tests
Reindent ext/mysqli tests on PHP-7.4, so they match with the
indentation on PHP-8.0. Otherwise merging test changes across
branches is very unpleasant.
Nikita Popov [Wed, 25 Nov 2020 14:54:26 +0000 (15:54 +0100)]
Allow running tidy.php on specific directory
Nikita Popov [Wed, 25 Nov 2020 11:28:15 +0000 (12:28 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix ref source management during unserialization
Nikita Popov [Wed, 25 Nov 2020 11:25:07 +0000 (12:25 +0100)]
Fix ref source management during unserialization
Only register the slot for adding ref sources later if we didn't
immediately register one. Also avoids leaking a ref source if
it is added early and the assignment fails.
Fixes oss-fuzz #27628.
Nikita Popov [Wed, 25 Nov 2020 10:55:05 +0000 (11:55 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
sockets: Fix variable/macro name collision on AIX
Calvin Buckley [Tue, 24 Nov 2020 19:45:34 +0000 (15:45 -0400)]
sockets: Fix variable/macro name collision on AIX
The name "rem_size" is used by a macro in a system header on AIX,
specifically `sys/xmem.h`. Without changing the name, you get the
name mangled like so:
```
In file included from /usr/include/sys/uio.h:92:0,
from /QOpenSys/pkgs/lib/gcc/powerpc-ibm-aix6.1.0.0/6.3.0/include-fixed-7.1/sys/socket.h:83,
from /usr/include/sys/syslog.h:151,
from /usr/include/syslog.h:29,
from /home/calvin/rpmbuild/BUILD/php-8.0.0RC5/main/php_syslog.h:27,
from /home/calvin/rpmbuild/BUILD/php-8.0.0RC5/main/php.h:318,
from /home/calvin/rpmbuild/BUILD/php-8.0.0RC5/ext/sockets/sendrecvmsg.c:17:
/home/calvin/rpmbuild/BUILD/php-8.0.0RC5/ext/sockets/sendrecvmsg.c: In function 'zif_socket_cmsg_space':
/home/calvin/rpmbuild/BUILD/php-8.0.0RC5/ext/sockets/sendrecvmsg.c:298:10: error: expected '=', ',', ';', 'asm' or '__attribute__' before '.' token
size_t rem_size = ZEND_LONG_MAX - entry->size;
^
/home/calvin/rpmbuild/BUILD/php-8.0.0RC5/ext/sockets/sendrecvmsg.c:298:10: error: expected expression before '.' token
/home/calvin/rpmbuild/BUILD/php-8.0.0RC5/ext/sockets/sendrecvmsg.c:299:18: error: 'u2' undeclared (first use in this function)
size_t n_max = rem_size / entry->var_el_size;
^
/home/calvin/rpmbuild/BUILD/php-8.0.0RC5/ext/sockets/sendrecvmsg.c:299:18: note: each undeclared identifier is reported only once for each function it appears in
```
...because of the declaration in `sys/xmem.h`:
```
```
This just renames the variable so that it won't trip on this
definition. Tested to fix the build on IBM i PASE.
Closes GH-6453.
Nikita Popov [Wed, 25 Nov 2020 10:48:51 +0000 (11:48 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80377
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:52 +0000 (16:42 +1100)]
Merge branch 'PHP-8.0' into master
* PHP-8.0:
Fix test diff
Christopher Jones [Wed, 25 Nov 2020 05:42:12 +0000 (16:42 +1100)]
Fix test diff
Dmitry Stogov [Wed, 25 Nov 2020 00:50:55 +0000 (03:50 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Use diferent temporary register (%r0 may keep a method address)
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:13:21 +0000 (01:13 +0300)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Revert "Fixed bug #80377"
Dmitry Stogov [Tue, 24 Nov 2020 22:10:26 +0000 (01:10 +0300)]
Revert "Fixed bug #80377"
This reverts commit
fc26ad9b1220fdfd7db15ecaff5e7c38283c55b6 .
Christoph M. Becker [Tue, 24 Nov 2020 17:19:07 +0000 (18:19 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
[ci skip] Fix misspelled method names
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:43:02 +0000 (16:43 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix usage of casted string in ReflectionParameter ctor
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:53:24 +0000 (15:53 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80377
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:50 +0000 (15:27 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80393
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 [Tue, 24 Nov 2020 13:12:55 +0000 (14:12 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Allow PHP_CURL_APIs to be imported by DLLs
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:07:18 +0000 (14:07 +0100)]
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #77961: finfo_open crafted magic parsing SIGABRT
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: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