summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix PDOStatement::bindColumn() parameter default valuePHP-8.0Máté Kocsis2021-03-252-3/+3
|
* XFAIL on WIN64 because of problem in libffiDmitry Stogov2021-03-241-0/+1
| | | | (cherry picked from commit 6689bedd1796380f882fdecc6dcf8da1ff885c2b)
* Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2021-03-242-1/+4
|\ | | | | | | | | * PHP-7.4: Fix #73533: Invalid memory access in php_libxml_xmlCheckUTF8
| * Fix #73533: Invalid memory access in php_libxml_xmlCheckUTF8PHP-7.4Christoph M. Becker2021-03-242-1/+4
| | | | | | | | | | | | | | 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.
* | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2021-03-231-1/+2
|\ \ | |/ | | | | | | * PHP-7.4: Properly initialize PS(mod) on RINIT
| * Properly initialize PS(mod) on RINITChristoph M. Becker2021-03-231-1/+2
| | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2021-03-222-16/+50
|\ \ | |/ | | | | | | * PHP-7.4: Fix #80889: amendment
| * Fix #80889: amendmentChristoph M. Becker2021-03-222-16/+50
| | | | | | | | | | | | | | | | | | | | `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.
* | Merge branch 'PHP-7.4' into PHP-8.0Jakub Zelenka2021-03-211-5/+42
|\ \ | |/
| * Use ServerClientTestCase in a test for default_socket_timeout=-1Jakub Zelenka2021-03-211-5/+42
| |
* | Merge branch 'PHP-7.4' into PHP-8.0Jakub Zelenka2021-03-216-38/+213
|\ \ | |/
| * Fix NEWS entry position for the latest FPM fixJakub Zelenka2021-03-211-2/+4
| |
| * Fix bug #80024: Duplication of info about inherited socket after pool removingJakub Zelenka2021-03-216-38/+211
| |
* | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2021-03-193-1/+42
|\ \ | |/ | | | | | | * PHP-7.4: Fix #80889: Cannot set save handler when save_handler is invalid
| * Fix #80889: Cannot set save handler when save_handler is invalidChristoph M. Becker2021-03-193-1/+42
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2021-03-184-2/+81
|\ \ | |/ | | | | | | * PHP-7.4: Fix #80783: PDO ODBC truncates BLOB records at every 256th byte
| * Fix #80783: PDO ODBC truncates BLOB records at every 256th byteChristoph M. Becker2021-03-184-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Additional fix for bug #80847.Dmitry Stogov2021-03-182-3/+83
| | | | | | | | On x86_64 part of structure may be passed in CPU registers.
* | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2021-03-182-1/+19
|\ \ | |/ | | | | | | * PHP-7.4: Fix locale switch back to C in pcre
| * Fix locale switch back to C in pcreNikita Popov2021-03-182-1/+19
| | | | | | | | | | | | 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.
* | Fixed bug #80861 (erronous array key overflow in 2D array with JIT)Dmitry Stogov2021-03-173-1/+114
| |
* | Fix signed/unsigned warnings in PDO ODBCNikita Popov2021-03-173-13/+15
| | | | | | | | | | | | Add add skipif to test. (cherry picked from commit aa58db723221ec891d4432621003bfa55dc15edf)
* | imagecolortransparent() cannot return nullNikita Popov2021-03-172-3/+3
| |
* | Return bool from imageinterlace()Nikita Popov2021-03-177-14/+14
| | | | | | | | | | | | | | 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.
* | Fixed bug #80839 (PHP problem with JIT)Dmitry Stogov2021-03-173-0/+46
| |
* | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2021-03-173-3/+29
|\ \ | |/ | | | | | | * PHP-7.4: Fix #66783: UAF when appending DOMDocument to element
| * Fix #66783: UAF when appending DOMDocument to elementChristoph M. Becker2021-03-173-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | 8.0.5 is nextChristoph M. Becker2021-03-174-10/+12
| | | | | | | | We also move the NEWS entry for bug 80847 to the proper version.
* | Fixed bug #80847 (CData structs with fields of type struct can't be passed ↵Dmitry Stogov2021-03-174-59/+83
| | | | | | | | as C function argument)
* | Fix refcount inference for typed propertiesNikita Popov2021-03-161-4/+3
| | | | | | | | | | 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.
* | Merge branch 'PHP-7.4' into PHP-8.0Derick Rethans2021-03-160-0/+0
|\ \ | |/
| * Fix build version tooDerick Rethans2021-03-161-1/+1
| |
* | Merge branch 'PHP-7.4' into PHP-8.0Derick Rethans2021-03-160-0/+0
|\ \ | |/
| * NEWS for 7.4.18Derick Rethans2021-03-161-1/+4
| |
| * Prepare for 7.4.17RC1Derick Rethans2021-03-161-1/+1
| |
* | Fix ldap_next_entry() parameter nameMáté Kocsis2021-03-162-4/+7
| |
* | Fix crash in LDAP search functions during argument validationMáté Kocsis2021-03-162-0/+18
| |
* | Add missing skipif sections to ext/dom testsMáté Kocsis2021-03-152-0/+4
| |
* | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2021-03-152-2/+5
|\ \ | |/ | | | | | | * PHP-7.4: Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
| * Fix #80817: dba_popen() may cause segfault during RSHUTDOWNChristoph M. Becker2021-03-152-2/+5
| | | | | | | | We need to close persistent streams with the proper flag.
* | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2021-03-153-0/+20
|\ \ | |/ | | | | | | * PHP-7.4: Fix bug #80866
| * Fix bug #80866Dharman2021-03-153-0/+20
| | | | | | | | Closes GH-6774.
* | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2021-03-153-1/+43
|\ \ | |/ | | | | | | * PHP-7.4: Fix bug #80837
| * Fix bug #80837Dharman2021-03-153-1/+41
| | | | | | | | The error needs to be reported on the statement, not the connection.
* | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2021-03-150-0/+0
|\ \ | |/ | | | | | | | | * PHP-7.4: Update ubuntu on i386 job Downgrade security level in tests using TLS < 1.2
| * Update ubuntu on i386 jobNikita Popov2021-03-151-1/+1
| | | | | | | | | | | | 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.
| * Downgrade security level in tests using TLS < 1.2Nikita Popov2021-03-155-4/+14
| | | | | | | | | | | | | | A few additional tests have been added on master that require lower security level. (cherry picked from commit c2a6395dcbab20549702e56006f7cd389cefebcd)
* | ext/opcache: fix configure output while checking mmap MAP_ANON supportMichael Heimpold2021-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Fixed bug #80814 (threaded mod_php won't load on FreeBSD: No space available ↵Dmitry Stogov2021-03-104-5/+7
| | | | | | | | for static Thread Local Storage)
* | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2021-03-083-0/+89
|\ \ | |/ | | | | | | * PHP-7.4: Fix #51903: simplexml_load_file() doesn't use HTTP headers