summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* sqlite3 linkage issue on some systems/package combination fix.David Carlier2020-08-213-1/+6
| | | | | | | Checking the version is not enough, the function might be available but the symbols are not present still. Closes GH-5993
* Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-08-211-1/+1
|\ | | | | | | | | * PHP-7.3: Fix wrong datatype
| * Fix wrong datatypeManuel Mausz2020-08-211-1/+1
| | | | | | | | | | | | ini_entry->modifiable is of type uint8_t and so should be the temp. variable. Especially important after 4b77a158. Closes GH-6028
* | Merge branch 'PHP-7.3' into PHP-7.4Matteo Beccati2020-08-183-2/+99
|\ \ | |/ | | | | | | * PHP-7.3: Fix #47021: SoapClient stumbles over WSDL delivered with "Transfer-Encoding: chunked"
| * Fix #47021: SoapClient stumbles over WSDL delivered with "Transfer-Encoding: ↵Matteo Beccati2020-08-183-2/+99
| | | | | | | | chunked"
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-08-180-0/+0
|\ \ | |/ | | | | | | * PHP-7.3: 7.3.23 is next
| * 7.3.23 is nextChristoph M. Becker2020-08-184-6/+9
| |
* | Prepare for 7.4.11Derick Rethans2020-08-183-5/+8
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-08-181-1/+1
|\ \ | |/ | | | | | | * PHP-7.3: Fix HTTP response status code
| * Fix HTTP response status codeChristoph M. Becker2020-08-181-1/+1
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-141-0/+1
|\ \ | |/ | | | | | | * PHP-7.3: Null terminate the sodium_crypto_kx_keypair() result
| * Null terminate the sodium_crypto_kx_keypair() resultNikita Popov2020-08-141-0/+1
| |
* | Add missing initialization check to RegexIterator::getRegex()Nikita Popov2020-08-141-0/+2
| |
* | Fixed bug #79724Nikita Popov2020-08-134-3/+9
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-119-6/+86
|\ \ | |/ | | | | | | * PHP-7.3: Fix #64705 errorInfo property of PDOException is null when PDO::__construct() fails
| * Fix #64705 errorInfo property of PDOException is null when ↵Ahmed Abdou2020-08-119-6/+86
| | | | | | | | | | | | | | | | | | PDO::__construct() fails PDO driver constructors are throwing PdoException without setting errorInfo, so create a new reusable function that throws exceptions for PDO and will also set the errorInfo. Use this function in pdo_mysql, pdo_sqlite, and pdo_pgsql.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-114-10/+39
|\ \ | |/ | | | | | | * PHP-7.3: Fix bug #75785 by attempt switching endianness on Maker's Note
| * Fix bug #75785 by attempt switching endianness on Maker's NoteNawarian2020-08-114-10/+39
| | | | | | | | | | | | | | | | | | | | Different manufacturer models may come with a different endianness (motorola/intel) format. In order to avoid a big refactor and a gigantic lookup table, this commit simply attempts to switch the endianness and proceed when values are acceptable. Closes GH-5849.
* | Fixed bug #79917Nikita Popov2020-08-112-34/+48
| | | | | | | | | | | | | | | | | | op_arrays can be shared on two levels: Either the op_array is completely shared, or it is distinct but shares all members (apart from static_variables). The the op_array is distinct, we need to make sure to properly initialize the MAP_PTR structures.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-08-113-7/+7
|\ \ | |/ | | | | | | * PHP-7.3: Fix #48585: com_load_typelib holds reference, fails on second call
| * Fix #48585: com_load_typelib holds reference, fails on second callChristoph M. Becker2020-08-113-7/+7
| | | | | | | | | | | | | | | | Whether the type library is cached is actually irrelevant here; what matters is that the symbols are imported, and since these are not cached, we have to import them for every request. And we cannot cache the symbols, because the import depends on the current codepage, but the codepage is a `PHP_INI_ALL` setting.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-113-10/+17
|\ \ | |/ | | | | | | * PHP-7.3: Fixed bug #79951
| * Fixed bug #79951Nikita Popov2020-08-113-10/+17
| | | | | | | | | | | | One branch did not release tmp_replace_entry_str. Also reduce the scope of some variables.
* | Merge branch 'PHP-7.3' into PHP-7.4George Wang2020-08-101-1/+2
|\ \ | |/
| * Make sure string is NUL byte terminated.George Wang2020-08-101-1/+2
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-101-1/+1
|\ \ | |/ | | | | | | * PHP-7.3: Check the correct list
| * Check the correct listNikita Popov2020-08-101-1/+1
| | | | | | | | This was supposed to check mx_list, not weight_list... oops.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-103-10/+15
|\ \ | |/ | | | | | | * PHP-7.3: Fix bug #79944
| * Fix bug #79944Nikita Popov2020-08-103-10/+15
| | | | | | | | Only return true from dns_get_mx if we actually found any MX record.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-08-103-2/+22
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79922: Crash after multiple calls to xml_parser_free()
| * Fix #79922: Crash after multiple calls to xml_parser_free()Christoph M. Becker2020-08-103-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must not call `zend_list_delete()` in resource closer functions exposed to userland, because decreasing the refcount there leads to use-after-free scenarios. In this case, commit 4a42fbb worked for typical use-cases where `xml_parser_free()` has been called exactly once for the resource, because there is an internal zval (`->index`) referencing the same resource which already increased the refcount by one. However, when `xml_parser_free()` is called multiple times on the same XML parser resource, the resource would be freed prematurely. Instead we forcefully close the resource in `xml_parser_free()`. We also could decrease the refcount of the resource there, but that would require to call `xml_parser_free()` which is somewhat uncommon, and would be particularly bad wrt. PHP 8 where that function is a NOP, and as such doesn't have to be called. So we do no longer increase the refcount of the resource when copying it to the internal zval, and let the usualy refcounting semantics take care of the resource destruction. [1] <http://git.php.net/?p=php-src.git;a=commit;h=4a42fbbbc73aad7427aef5c89974d1833636e082>
* | Fixed bug #79947Nikita Popov2020-08-105-4/+24
| | | | | | | | | | | | Move the FREE_OP for op_data out of the zend_binary_assign_op_dim_slow() slow path, so it can be used by the other error path as well. This makes ASSIGN_DIM_OP structurally more similar to ASSIGN_DIM.
* | Prevent tempnam tests conflictsChristoph M. Becker2020-08-072-24/+24
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-0718-0/+4
|\ \ | |/ | | | | | | * PHP-7.3: Fix bug #70574: Move files to proper locale dir
| * Fix bug #70574: Move files to proper locale dirFlorian Engelhardt2020-08-0718-0/+4
| | | | | | | | Closes GH-5940.
* | Fix file clash in zlib testNikita Popov2020-08-061-1/+1
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-063-0/+32
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79934: CRLF-only line in heredoc causes parsing error
| * Fix #79934: CRLF-only line in heredoc causes parsing errorPieter van den Ham2020-08-065-351/+383
| | | | | | | | | | | | | | Fixes the function `next_newline()` in zend_language_scanner.l. The function now correctly returns a newline_len of 2 for "\r\n". Closes GH-5944.
* | Check ps -p availability in process title testNikita Popov2020-08-051-1/+6
| |
* | Add privilege check in pcntl_unshare testNikita Popov2020-08-051-2/+5
| | | | | | | | Privileges for CLONE_NEWPID were not checked.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-052-8/+22
|\ \ | |/ | | | | | | * PHP-7.3: Fix memory leak on socket_sendmsg() / socket_recvmsg() error
| * Fix memory leak on socket_sendmsg() / socket_recvmsg() errorNikita Popov2020-08-052-8/+22
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-053-1/+38
|\ \ | |/ | | | | | | * PHP-7.3: Fixed bug #79930
| * Fixed bug #79930Nikita Popov2020-08-053-1/+38
| | | | | | | | We're inserting src_zval, so that's what we should addref.
* | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-08-051-1/+1
|\ \ | |/ | | | | | | * PHP-7.3: Fix iov_base pointer type for illumos
| * Fix iov_base pointer type for illumosDavid Carlier2020-08-051-1/+1
| | | | | | | | | | | | | | These systems has two versions of the iovec interface dependent on compiler flags passed, the legacy version causing little build issue. Closes GH-5939.
* | Backport bless_tests.php changes from PHP 8Nikita Popov2020-08-051-3/+168
| |
* | Unset ai_canonname field in dumpNikita Popov2020-08-051-5/+5
| | | | | | | | | | | | Okay, looks like ai_canonname does not get set on macos even if AI_CANONNAME is specified, so canonicalize this in the other direction instead and unset ai_canonname if it is present.
* | Check ps -p availability in proc_nice testNikita Popov2020-08-051-0/+4
| |
* | Set AI_CANONNAME flag in socket_addrinfo testNikita Popov2020-08-051-1/+4
| | | | | | | | | | Musl always populates ai_canonname. Set the flag to avoid output discrepancies.