]>
granicus.if.org Git - php/log
Máté Kocsis [Thu, 25 Mar 2021 18:30:46 +0000 (19:30 +0100)]
Fix PDOStatement::bindColumn() parameter default value
Dmitry Stogov [Fri, 19 Mar 2021 09:19:24 +0000 (12:19 +0300)]
XFAIL on WIN64 because of problem in libffi
(cherry picked from commit
6689bedd1796380f882fdecc6dcf8da1ff885c2b )
Christoph M. Becker [Wed, 24 Mar 2021 10:52:27 +0000 (11:52 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #73533: Invalid memory access in php_libxml_xmlCheckUTF8
Christoph M. Becker [Tue, 23 Mar 2021 15:13:57 +0000 (16:13 +0100)]
Fix #73533: Invalid memory access in php_libxml_xmlCheckUTF8
A string passed to `php_libxml_xmlCheckUTF8()` may be longer than
1<<31-1 bytes, so we're better using a `size_t`.
Closes GH-6802.
Christoph M. Becker [Tue, 23 Mar 2021 12:13:43 +0000 (13:13 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Properly initialize PS(mod) on RINIT
Christoph M. Becker [Mon, 22 Mar 2021 12:21:07 +0000 (13:21 +0100)]
Properly initialize PS(mod) on RINIT
We need to do that in case a user handler has been set. However, we
can't do that in `php_rinit_session_globals()` since that function is
called by PHP function `session_destroy()` too, but in that case we
don't want to reset PS(mod).
Closes GH-6795.
Christoph M. Becker [Mon, 22 Mar 2021 21:49:46 +0000 (22:49 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80889: amendment
Christoph M. Becker [Mon, 22 Mar 2021 21:14:01 +0000 (22:14 +0100)]
Fix #80889: amendment
`session_set_save_handler()` may be called with callables instead of an
object; we need to cater to that as well.
We also extract a set_user_save_handler_ini() function to avoid code
duplication.
Closes GH-6796.
Jakub Zelenka [Sun, 21 Mar 2021 21:21:05 +0000 (21:21 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Jakub Zelenka [Fri, 27 Nov 2020 17:29:23 +0000 (17:29 +0000)]
Use ServerClientTestCase in a test for default_socket_timeout=-1
Jakub Zelenka [Sun, 21 Mar 2021 19:00:38 +0000 (19:00 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Jakub Zelenka [Sun, 21 Mar 2021 18:58:57 +0000 (18:58 +0000)]
Fix NEWS entry position for the latest FPM fix
Jakub Zelenka [Sun, 28 Feb 2021 21:08:17 +0000 (21:08 +0000)]
Fix bug #80024: Duplication of info about inherited socket after pool removing
Christoph M. Becker [Fri, 19 Mar 2021 16:03:35 +0000 (17:03 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80889: Cannot set save handler when save_handler is invalid
Christoph M. Becker [Fri, 19 Mar 2021 13:47:49 +0000 (14:47 +0100)]
Fix #80889: Cannot set save handler when save_handler is invalid
There is no need to require a (valid) save_handler to be set, when a
user handler is supposed to be set. We just have to make sure, that
no user handler is already set in this case.
Closes GH-6788.
Christoph M. Becker [Thu, 18 Mar 2021 14:16:01 +0000 (15:16 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80783: PDO ODBC truncates BLOB records at every 256th byte
Christoph M. Becker [Thu, 25 Feb 2021 13:38:42 +0000 (14:38 +0100)]
Fix #80783: PDO ODBC truncates BLOB records at every 256th byte
It is not guaranteed, that the driver inserts only a single NUL byte at
the end of the buffer. Apparently, there is no way to find out the
actual data length in the buffer after calling `SQLGetData()`, so we
adjust after the next `SQLGetData()` call.
We also prevent PDO::ODBC_ATTR_ASSUME_UTF8 from fetching garbage, by
fetching all chunks with the same C type.
Closes GH-6716.
Dmitry Stogov [Thu, 18 Mar 2021 13:13:42 +0000 (16:13 +0300)]
Additional fix for bug #80847.
On x86_64 part of structure may be passed in CPU registers.
Nikita Popov [Thu, 18 Mar 2021 09:50:57 +0000 (10:50 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix locale switch back to C in pcre
Nikita Popov [Thu, 18 Mar 2021 09:48:43 +0000 (10:48 +0100)]
Fix locale switch back to C in pcre
The compile context is shared between patterns, so we need to set
the character tables unconditionally in case we switched from
a non-C locale to the C locale.
Dmitry Stogov [Wed, 17 Mar 2021 19:59:59 +0000 (22:59 +0300)]
Fixed bug #80861 (erronous array key overflow in 2D array with JIT)
Nikita Popov [Mon, 14 Dec 2020 09:02:25 +0000 (10:02 +0100)]
Fix signed/unsigned warnings in PDO ODBC
Add add skipif to test.
(cherry picked from commit
aa58db723221ec891d4432621003bfa55dc15edf )
Nikita Popov [Wed, 17 Mar 2021 14:09:06 +0000 (15:09 +0100)]
imagecolortransparent() cannot return null
Nikita Popov [Wed, 17 Mar 2021 14:05:09 +0000 (15:05 +0100)]
Return bool from imageinterlace()
The function accepts a bool since PHP 8.0, so it should also return
a bool to keep things consistent.
Furthermore a null return from this functions is not possible.
Dmitry Stogov [Wed, 17 Mar 2021 13:55:09 +0000 (16:55 +0300)]
Fixed bug #80839 (PHP problem with JIT)
Christoph M. Becker [Wed, 17 Mar 2021 11:39:06 +0000 (12:39 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #66783: UAF when appending DOMDocument to element
Christoph M. Becker [Mon, 15 Mar 2021 09:26:50 +0000 (10:26 +0100)]
Fix #66783: UAF when appending DOMDocument to element
According to the DOM standard, elements may only contain element, text,
processing instruction and comment nodes[1]. It is also specified that
a HierarchyRequestError should be thrown if a document is to be
inserted[2]. We follow that standard, and prevent the use-after-free
this way.
[1] <https://dom.spec.whatwg.org/#node-trees>
[2] <https://dom.spec.whatwg.org/#mutation-algorithms>
Closes GH-6765.
Christoph M. Becker [Wed, 17 Mar 2021 11:12:01 +0000 (12:12 +0100)]
8.0.5 is next
We also move the NEWS entry for bug 80847 to the proper version.
Dmitry Stogov [Wed, 17 Mar 2021 06:55:20 +0000 (09:55 +0300)]
Fixed bug #80847 (CData structs with fields of type struct can't be passed as C function argument)
Nikita Popov [Tue, 16 Mar 2021 10:15:48 +0000 (11:15 +0100)]
Fix refcount inference for typed properties
We were not adding RC1/RCN if the MAY_BE_OBJECT came from a class
type and there was no other refcounted type in the union.
Derick Rethans [Tue, 16 Mar 2021 09:41:40 +0000 (09:41 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Derick Rethans [Tue, 16 Mar 2021 09:41:21 +0000 (09:41 +0000)]
Fix build version too
Derick Rethans [Tue, 16 Mar 2021 09:40:21 +0000 (09:40 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Derick Rethans [Tue, 16 Mar 2021 09:40:05 +0000 (09:40 +0000)]
NEWS for 7.4.18
Derick Rethans [Tue, 16 Mar 2021 09:33:33 +0000 (09:33 +0000)]
Prepare for 7.4.17RC1
Máté Kocsis [Mon, 15 Mar 2021 22:07:27 +0000 (23:07 +0100)]
Fix ldap_next_entry() parameter name
Máté Kocsis [Mon, 15 Mar 2021 22:07:05 +0000 (23:07 +0100)]
Fix crash in LDAP search functions during argument validation
Máté Kocsis [Mon, 15 Mar 2021 22:45:37 +0000 (23:45 +0100)]
Add missing skipif sections to ext/dom tests
Christoph M. Becker [Mon, 15 Mar 2021 17:39:11 +0000 (18:39 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
Christoph M. Becker [Mon, 1 Mar 2021 17:14:26 +0000 (18:14 +0100)]
Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
We need to close persistent streams with the proper flag.
Nikita Popov [Mon, 15 Mar 2021 13:47:50 +0000 (14:47 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #80866
Dharman [Mon, 15 Mar 2021 12:21:44 +0000 (12:21 +0000)]
Fix bug #80866
Closes GH-6774.
Nikita Popov [Mon, 15 Mar 2021 13:38:22 +0000 (14:38 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix bug #80837
Dharman [Fri, 5 Mar 2021 21:45:27 +0000 (21:45 +0000)]
Fix bug #80837
The error needs to be reported on the statement, not the connection.
Nikita Popov [Mon, 15 Mar 2021 13:12:42 +0000 (14:12 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Update ubuntu on i386 job
Downgrade security level in tests using TLS < 1.2
Nikita Popov [Mon, 15 Mar 2021 11:11:51 +0000 (12:11 +0100)]
Update ubuntu on i386 job
There is a failure with apt on PHP-7.4 that's not present on
PHP-8.0/master. Switching to a newer ubuntu version on PHP-7.4
avoids the issue.
Nikita Popov [Thu, 18 Jun 2020 13:08:24 +0000 (15:08 +0200)]
Downgrade security level in tests using TLS < 1.2
A few additional tests have been added on master that require
lower security level.
(cherry picked from commit
c2a6395dcbab20549702e56006f7cd389cefebcd )
Michael Heimpold [Sun, 7 Mar 2021 09:00:43 +0000 (10:00 +0100)]
ext/opcache: fix configure output while checking mmap MAP_ANON support
It seems that
f3efb9e3fb introduced a "typo" which may result
in the following confusing message:
checking for mmap() using MAP_ANON shared memory support... no=yes
Let's fix this.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Closes GH-6758.
Dmitry Stogov [Wed, 10 Mar 2021 13:03:47 +0000 (16:03 +0300)]
Fixed bug #80814 (threaded mod_php won't load on FreeBSD: No space available for static Thread Local Storage)
Christoph M. Becker [Mon, 8 Mar 2021 14:08:11 +0000 (15:08 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #51903: simplexml_load_file() doesn't use HTTP headers
Christoph M. Becker [Wed, 3 Mar 2021 18:23:39 +0000 (19:23 +0100)]
Fix #51903: simplexml_load_file() doesn't use HTTP headers
The `encoding` attribute of the XML declaration is optional; it is good
practice to use external encoding information where available if it is
missing. Thus, we check for `charset` info of `Content-Type` headers,
and see whether the encoding is supported.
We cater to trailing parameters and quoted-strings, but not to escaped
backslashes and quotes in quoted-strings, since no known character
encoding contains these anyway.
Co-authored-by: Michael Wallner <mike@php.net>
Closes GH-6747.
Christoph M. Becker [Mon, 8 Mar 2021 13:39:38 +0000 (14:39 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80838: HTTP wrapper waits for HTTP 1 response after HTTP 101
manuel [Fri, 5 Mar 2021 23:59:45 +0000 (00:59 +0100)]
Fix #80838: HTTP wrapper waits for HTTP 1 response after HTTP 101
Don't wait for further responses after a HTTP 101 (Switching Protocols) response
Closes GH-6730.
Máté Kocsis [Fri, 5 Mar 2021 23:56:25 +0000 (00:56 +0100)]
Fix the error message of attribute flag validation
George Wang [Fri, 5 Mar 2021 16:00:53 +0000 (11:00 -0500)]
Merge branch 'PHP-7.4' into PHP-8.0
George Wang [Fri, 5 Mar 2021 15:57:46 +0000 (10:57 -0500)]
Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4
George Wang [Fri, 5 Mar 2021 15:46:12 +0000 (10:46 -0500)]
LiteSpeed SAPI v7.9: Process manager keeps forked child process alive for longer time based on load. Reduces PM overhead for busy setup.
David Carlier [Sat, 27 Feb 2021 14:07:59 +0000 (14:07 +0000)]
Add supports for FreeBSD's PROT_MAX to let mprotect knows X flag can be applied in addition.
Closes GH-6738.
Christoph M. Becker [Fri, 5 Mar 2021 14:08:24 +0000 (15:08 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Print error code if CreateMutex() fails
Christoph M. Becker [Tue, 2 Mar 2021 11:19:43 +0000 (12:19 +0100)]
Print error code if CreateMutex() fails
This issue came up recently in a bug report[1]; without the error code,
users can barely guess why the function failed.
[1] <https://bugs.php.net/80812>
Closes GH-6745.
Dmitry Stogov [Thu, 4 Mar 2021 14:27:26 +0000 (17:27 +0300)]
Fix ASAN warning (Zend/zend_string.h:165:2: runtime error: null pointer passed as argument 2 of memcpy(), which is declared to never be null)
Christoph M. Becker [Wed, 3 Mar 2021 21:56:42 +0000 (22:56 +0100)]
Fix #80825: ZipArchive::isCompressionMethodSupported does not exist
`HAVE_METHOD_SUPPORTED` should have been defined after we updated to
libzip 1.7.1 months ago.
Christoph M. Becker [Wed, 3 Mar 2021 10:56:03 +0000 (11:56 +0100)]
Fix test wrt. server.inc changes
Christoph M. Becker [Wed, 3 Mar 2021 09:47:09 +0000 (10:47 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #78719: http wrapper silently ignores long Location headers
Christoph M. Becker [Tue, 23 Feb 2021 14:32:54 +0000 (15:32 +0100)]
Fix #78719: http wrapper silently ignores long Location headers
When opening HTTP streams, and reading the headers, we currently
discard header lines longer than `HTTP_HEADER_BLOCK_SIZE` (1024 bytes).
While this is not generally forbidden by RFC 7230, section 3.2.5, it
is not generally allowed either, since that may change the "message
framing or response semantics".
We thus fix this by allowing arbitrarily long header lines.
Closes GH-6720.
Dmitry Stogov [Mon, 1 Mar 2021 20:57:20 +0000 (23:57 +0300)]
Fixed bug #80802: (zend_jit_fetch_indirect_var assert failure with tracing JIT)
Christoph M. Becker [Mon, 1 Mar 2021 17:50:11 +0000 (18:50 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80751: Comma in recipient name breaks email delivery
Christoph M. Becker [Mon, 1 Mar 2021 15:18:40 +0000 (16:18 +0100)]
Fix #80751: Comma in recipient name breaks email delivery
So far, `SendText()` simply separates potential email address lists at
any comma, disregarding that commas inside a quoted-string do not
delimit addresses. We fix that by introducing an own variant of
`strtok_r()` which caters to quoted-strings.
We also make `FormatEmailAddress()` aware of quoted strings.
We do not cater to email address comments, and potentially other quirks
of RFC 5322 email addresses, but catering to quoted-strings is supposed
to solve almost all practical use cases.
Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
Closes GH-6735.
Nikita Popov [Mon, 1 Mar 2021 14:01:09 +0000 (15:01 +0100)]
Fixed bug #80811
When filling in defaults for skipped params, make sure that
reference parameters get the expected reference wrapper.
Nikita Popov [Mon, 1 Mar 2021 15:22:29 +0000 (16:22 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Always remove HT iterators, even for uninit HT
Nikita Popov [Mon, 1 Mar 2021 15:20:31 +0000 (16:20 +0100)]
Always remove HT iterators, even for uninit HT
Fixes oss-fuzz #31423.
Nikita Popov [Mon, 1 Mar 2021 14:13:25 +0000 (15:13 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fixed bug #80805
Nikita Popov [Fri, 11 Sep 2020 20:36:41 +0000 (22:36 +0200)]
Fixed bug #80805
Handle missing result_var in binary_op_result_type.
(cherry picked from commit
8446e2827585c37d0739f8d44fa8d359cbbb6551 )
George Peter Banyard [Fri, 26 Feb 2021 03:03:38 +0000 (03:03 +0000)]
Fix Bug #80800 imap_open() fails when the flags parameter includes CL_EXPUNGE
This also affected imap_reopen().
Add a supplementary test that the CL_EXPUNGE flag does have
the intended effect.
Closes GH-6732
Felipe Pena [Thu, 25 Feb 2021 20:54:24 +0000 (20:54 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Felipe Pena [Thu, 25 Feb 2021 20:53:14 +0000 (20:53 +0000)]
Fix memleak on ReflectionFunction and ReflectionGenerator classes when calling __construct after instantiation
Remi Collet [Thu, 25 Feb 2021 12:54:19 +0000 (13:54 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
skip test with openssl < 1.1.0
Remi Collet [Thu, 25 Feb 2021 12:52:35 +0000 (13:52 +0100)]
skip test with openssl < 1.1.0
The test fails, but without any crash
(this test is designed to catch a crash)
Christoph M. Becker [Thu, 25 Feb 2021 11:03:43 +0000 (12:03 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Capture Microsoft-defined HRESULT exit codes exit codes
Dylan K. Taylor [Tue, 23 Feb 2021 21:34:51 +0000 (22:34 +0100)]
Capture Microsoft-defined HRESULT exit codes exit codes
The lack of such a check leads to false-passes of tests on Windows
which expect no output, but produce a segfault or similar issue. I
discovered this a while ago due to bad tests in an extension I maintain.
Closes GH-6722.
David CARLIER [Wed, 24 Feb 2021 20:34:33 +0000 (20:34 +0000)]
crc32 module, clang spurious warning removal.
Closes GH-6725.
Nikita Popov [Thu, 25 Feb 2021 08:52:07 +0000 (09:52 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
mysqlnd pam fix test error message
Daniel Black [Thu, 25 Feb 2021 02:09:08 +0000 (13:09 +1100)]
mysqlnd pam fix test error message
Closes GH-6727.
Nikita Popov [Wed, 24 Feb 2021 20:30:44 +0000 (21:30 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix potential file collision in dom tests
Nikita Popov [Wed, 24 Feb 2021 20:30:20 +0000 (21:30 +0100)]
Fix potential file collision in dom tests
Felipe Pena [Wed, 24 Feb 2021 19:07:22 +0000 (19:07 +0000)]
Merge branch 'PHP-7.4' into PHP-8.0
Felipe Pena [Wed, 24 Feb 2021 18:17:27 +0000 (18:17 +0000)]
Fix bug #80757 (Exit code is 0 when could not open file)
Felipe Pena [Wed, 24 Feb 2021 18:40:32 +0000 (18:40 +0000)]
Update NEWS
Dmitry Stogov [Wed, 24 Feb 2021 09:20:20 +0000 (12:20 +0300)]
Fixed bug #80782 (DASM_S_RANGE_VREG on PHP_INT_MIN-1)
Christoph M. Becker [Tue, 23 Feb 2021 12:22:25 +0000 (13:22 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
run-tests: fixed exit code not being set on BORKED tests
Christoph M. Becker [Tue, 23 Feb 2021 12:14:42 +0000 (13:14 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
run-tests: fixed exit code not being set on BORKED tests
Dylan K. Taylor [Mon, 22 Feb 2021 23:56:11 +0000 (23:56 +0000)]
run-tests: fixed exit code not being set on BORKED tests
When no test paths are specified this shows up when 'make test' is used on a PECL extension without specifying tests to run (or in php-src too, I guess...)
Closes GH-6717.
Christoph M. Becker [Tue, 23 Feb 2021 11:16:15 +0000 (12:16 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Update php_version.h to proper version number
Christoph M. Becker [Tue, 23 Feb 2021 11:09:06 +0000 (12:09 +0100)]
Update php_version.h to proper version number
Nikita Popov [Tue, 23 Feb 2021 09:17:30 +0000 (10:17 +0100)]
Fixed bug #80786
Don't use r0 as temporary register in math_double_long if it is
already used for a memory result.
This was already done in one branch, but not the other.
Christoph M. Becker [Mon, 22 Feb 2021 14:31:49 +0000 (15:31 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #75776: Flushing streams with compression filter is broken
Christoph M. Becker [Tue, 16 Feb 2021 18:36:37 +0000 (19:36 +0100)]
Fix #75776: Flushing streams with compression filter is broken
First, the `bzip2.compress` filter has the same issue as `zlib.deflate`
so we port the respective fix[1] to ext/bz2.
Second, there is still an issue, if a stream with an attached
compression filter is flushed before it is closed, without any writes
in between. In that case, the compression is never finalized. We fix
this by enforcing a `_php_stream_flush()` with the `closing` flag set
in `_php_stream_free()`, whenever a write filter is attached. This
call is superfluous for most write filters, but does not hurt, even
when it is unnecessary.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
20e75329f2adb11dd231852c061926d0e4080929 >
Closes GH-6703.
Christoph M. Becker [Mon, 22 Feb 2021 13:33:49 +0000 (14:33 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80771: phpinfo(INFO_CREDITS) displays nothing in CLI
Christoph M. Becker [Mon, 22 Feb 2021 11:24:15 +0000 (12:24 +0100)]
Fix #80771: phpinfo(INFO_CREDITS) displays nothing in CLI
There is no good reason not to show the credits in text based SAPIs,
except for brevity. Thus, we suppress the credits from `php -i`.
Closes GH-6710.
Christoph M. Becker [Mon, 22 Feb 2021 11:34:54 +0000 (12:34 +0100)]
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80774: session_name() problem with backslash