summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Revert "Fix #76813: Access violation near NULL on source operand"Christoph M. Becker2021-01-114-24/+3
| | | | | | | | | | This reverts commit 5e15c9c41f8318a8392c2e2c78544f218736549c, since re2c default rules are only available as of re2c 0.13.7.
* | Avoid modifying the return value of readline_completion_function()Christoph M. Becker2021-01-071-0/+1
| | | | | | | | | | | | | | | | | | The internal function `_readline_command_generator()` modifies the internal array pointer of `readline_completion_function()`'s return value. We therefore separate the array, what also avoids failing assertions regarding the array refcount. Closes GH-6582.
* | Fix #77565: Incorrect locator detection in ZIP-based pharsChristoph M. Becker2021-01-056-40/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must not assume that the first end of central dir signature in a ZIP archive actually designates the end of central directory record, since the data in the archive may contain arbitrary byte patterns. Thus, we better search from the end of the data, what is also slightly more efficient. There is, however, no way to detect the end of central directory signature by searching from the end of the ZIP archive with absolute certainty, since the signature could be part of the trailing comment. To mitigate, we check that the comment length fits to the found position, but that might still not be the correct position in rare cases. Closes GH-6507.
* | Fix memory leak in Phar::webPhar() on WindowsChristoph M. Becker2021-01-051-19/+17
| | | | | | | | Closes GH-6574.
* | gdbinit: use ____print_str to print htable keysDylan K. Taylor2021-01-051-1/+2
| | | | | | | | | | | | | | | | | | I noticed this problem while dumping the contents of EG(function_table), where keys for closures start with a null byte. printf interprets this as a zero-length string and emits nothing. This allows the key to be rendered properly in readable form. Closes GH-6577.
* | Disable non-cron travis jobsNikita Popov2021-01-041-0/+3
| | | | | | | | | | This was already done for PHP-8.0 and master, do it for PHP-7.4 as well.
* | [ci skip] Update NEWSStanislav Malyshev2021-01-041-0/+2
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2021-01-040-0/+0
|\ \ | |/ | | | | | | * PHP-7.3: [ci skip] Fix order
| * [ci skip] Fix orderStanislav Malyshev2021-01-041-2/+2
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2021-01-040-0/+0
|\ \ | |/ | | | | | | * PHP-7.3: [ci skip] Unpdate NEWS
| * [ci skip] Unpdate NEWSStanislav Malyshev2021-01-041-0/+2
| |
* | Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2021-01-017-15/+61
|\ \ | |/ | | | | | | * PHP-7.3: Fix #77423: parse_url() will deliver a wrong host to user
| * Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2021-01-017-15/+61
| |\ | | | | | | | | | | | | * PHP-7.2: Fix #77423: parse_url() will deliver a wrong host to user
| | * Fix #77423: parse_url() will deliver a wrong host to userPHP-7.2Christoph M. Becker2021-01-017-14/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid that `parse_url()` returns an erroneous host, which would be valid for `FILTER_VALIDATE_URL`, we make sure that only userinfo which is valid according to RFC 3986 is treated as such. For consistency with the existing url parsing code, we use ctype functions, although that is not necessarily correct.
* | | Replace sort() function calls with ksort() in basic ksort testhaszi2020-12-271-27/+27
| | | | | | | | | | | | Closes GH-6541.
* | | Fix #80384: limit read buffer sizeAdam Seitz2020-12-234-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of a stream with no filters, php_stream_fill_read_buffer only reads stream->chunk_size into the read buffer. If the stream has filters attached, it could unnecessarily buffer a large amount of data. With this change, php_stream_fill_read_buffer only proceeds until either the requested size or stream->chunk_size is available in the read buffer. Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de> Closes GH-6444.
* | | Fixed bug #80376 (last day of the month causes runway cpu usage)Derick Rethans2020-12-213-16889/+19647
| | |
* | | MySQLnd: Support cursors in store/get resultNikita Popov2020-12-185-92/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes two related issues: 1. When a PS with cursor is used in store_result/get_result, perform a COM_FETCH with maximum number of rows rather than silently switching to an unbuffered result set (in the case of store_result) or erroring (in the case of get_result). In the future, we might want to make get_result unbuffered for PS with cursors, as using cursors with buffered result sets doesn't really make sense. Unlike store_result, get_result isn't very explicit about what kind of result set is desired. 2. If the client did not request a cursor, but the server reports that a cursor exists, ignore this and treat the PS as if it has no cursor (i.e. to not use COM_FETCH). It appears to be a server side bug that a cursor used inside an SP will be reported to the client, even though the client cannot use the cursor. Fixes bug #64638, bug #72862, bug #77935. Closes GH-6518.
* | | Fixed bug #67983Nikita Popov2020-12-163-22/+62
| | | | | | | | | | | | | | | We need to check the BIT case first, otherwise it will get skipped in INT_AND_FLOAT_NATIVE mode.
* | | Fix bug #80523Nikita Popov2020-12-162-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Don't truncate the file length to unsigned int... I have no idea whether that fully fixes the problem because the process gets OOM killed before finishing, but at least the immediate parse error is gone now.
* | | Prepare for 7.4.15Derick Rethans2020-12-151-1/+5
| | |
* | | Fix #77322: PharData::addEmptyDir('/') Possible integer overflowChristoph M. Becker2020-12-153-2/+28
| | | | | | | | | | | | | | | | | | | | | `phar_path_check()` already strips a leading slash, so we must not attempt to strip the trailing slash from an now empty directory name. Closes GH-6508.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-12-150-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: 7.3.27 is next
| * | 7.3.27 is nextChristoph M. Becker2020-12-154-6/+9
| | |
* | | IBM i PASE doesn't support ITIMER_PROFCalvin Buckley2020-12-152-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like Cygwin, this platform needs to use a real-time timer. This was based on a patch by @kadler, but it didn't handle unsetting the timer, so the timeout would continue to be active, triggering `hard_timeout` unexpectedly. The patch is fixed to handle unsetting. Closes GH-6503.
* | | Drop pdo_mysql_prepare_load_data.phptChristoph M. Becker2020-12-141-129/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like the test title and some comments in this test describe, this test was supposed to have `::prepare()` failing because `LOAD DATA INFILE` would not be supported as prepared statement, and then the test checks whether follow-up queries would succeed. However, `LOAD DATA INFILE` is supported for prepared statements at least on Windows with mysqlnd, so the test does no longer test what it is supposed to do. Therefore, we drop it. Closes GH-6509.
* | | Fix bug #69625: FPM returns 200 status on request without SCRIPT_FILENAMEJakub Zelenka2020-12-135-6/+84
| | |
* | | Fixed bug #76815Nikita Popov2020-12-103-0/+42
| | | | | | | | | | | | | | | | | | When we receive an error while reading a result set, we should assume that no more result sets are available. libmysqlclient implements the same behavior.
* | | Fixed bug #71145Nikita Popov2020-12-103-5/+34
| | | | | | | | | | | | Consume any additional result sets when running INIT_COMMAND.
* | | Backport fix for bug #70066Nikita Popov2020-12-105-11/+37
| | | | | | | | | | | | | | | | | | | | | Given the number of duplicates this bug report had, it seems worthwhile to fix this on PHP-7.4 as well. Cherry-pick of 106e7e4bca7c0fd975eb219b18e3c34957ba8657.
* | | Fixed bug #78154Nikita Popov2020-12-093-1/+37
| | | | | | | | | | | | Handle errors during next_result in exec.
* | | Fix #48725: Support for flushing in zlib streamChristoph M. Becker2020-12-083-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `php_zlib_deflate_filter()` is called with `PSFS_FLAG_FLUSH_INC` but without new buckets being available (e.g. because a user calls `rewind()` after writing to the stream), we have to make sure that any pending data are flushed. This could basically be done like in the attached patch[1], but that could cause unnessary flushes, which can be harmful for compression, and adds unnecessary flush markers to the stream. Thus, we use the `php_zlib_filter_data.finished` field, which has not been used for `zlib.deflate` filters, and properly keep track of the need to flush. [1] <https://bugs.php.net/patch-display.php?bug_id=48725&patch=zlib-filter-flush-fix.patch&revision=latest> Closes GH-6019.
* | | Fix #77069: stream filter loses final block of dataChristoph M. Becker2020-12-087-2/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reading from a stream may return greater than zero, but nonetheless the stream's EOF flag may have been set. We have to cater to this condition by setting the close flag for filters. We also have to cater to that change in the zlib.inflate filter: If `inflate()` is called with flush mode `Z_FINISH`, but the output buffer is not large enough to inflate all available data, it fails with `Z_BUF_ERROR`. However, `Z_BUF_ERROR` is not fatal; in fact, the zlib manual states: "If deflate returns with Z_OK or Z_BUF_ERROR, this function must be called again with Z_FINISH and more output space (updated avail_out) but no more input data, until it returns with Z_STREAM_END or an error." Hence, we do so. Closes GH-6001.
* | | Fixed bug #63185Nikita Popov2020-12-083-0/+70
| | |
* | | Fixed bug #80458Dharman2020-12-043-11/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no result set (e.g. for upsert queries), still allow fetching to occur without error, i.e. treat it the same way as an empty result set. This normalizes behavior between native and emulated prepared statements and addresses a regression in PHP 7.4.13.
* | | Fix #75102: `PharData` says invalid checksum for valid tarChristoph M. Becker2020-12-044-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, there are broken tarballs out there which are actually in ustar format, but did not write the `ustar` marker. Since popular tar tools like GNU tar and 7zip have no issues dealing with such tarballs, Phar should also be more resilient. Thus, when the first checksum check of a tarball in (presumed) in old- style format fails, we check whether the checksum would be suitable for ustar format; if so, we treat the tarball as being in ustar format. Closes GH-6479.
* | | Upload coverage data to codecov.ioPaul Crovella2020-12-031-1/+4
| | | | | | | | | | | | Closes GH-6486.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-12-031-13/+26
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix mysqli_expire_password test for mariadb
| * | Fix mysqli_expire_password test for mariadbDaniel Black2020-12-031-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MariaDB-10.4.3 EXPIRE passwords where supported for MariaDB. This only behaves like MySQL when the system variable disconnect_on_expired_passwords=1. MariaDB if there was no password it could not be considered expired. So the test is adjusted to use actual passwords. (MariaDB commit a94b20a8e0d9e64eeaabdaaa7a3e03fcdb8a686e) The error codes produced my MariaDB are different however still conforming to the SQL specification. Closes GH-6480.
* | | fix mysqli_stmt_get_result_metadata_fetch_field test for mariadbDaniel Black2020-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | MariaDB extended the default decimal field to 39 characters instead of MySQL's 31 characters. This small change allows the test to pass on MySQL and MariaDB. Closes GH-6484.
* | | Backport fix for bug #78750Peter Kokot2020-12-031-0/+6
| | | | | | | | | | | | | | | | | | | | | Cherry-picks fe2afef36fc78c267133ddd403f48e0ee799efbc and 86e2b7bb70131b48636cded57e5bc62b81b79865.
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-12-021-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fixed bug #80457
| * | Fixed bug #80457Nikita Popov2020-12-022-1/+4
| | | | | | | | | | | | | | | | | | | | | On x32 sizeof(size_t) != sizeof(zend_long), so we need to be careful with sign extension here. Patch by bruno dot premont at restena dot lu.
* | | Fix #73809: Phar Zip parse crash - mmap failChristoph M. Becker2020-12-013-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Phar signatures practically are of limited size; for the MD5 and SHA hashes the size is fixed (at most 64 bytes for SHA512); for OpenSSL public keys there is no size limit in theory, but "64 KiB ought to be good enough for anybody". So we check for that limit, to avoid fatal errors due to out of memory conditions. Since it is neither possible to have the signature compressed in the ZIP archive, nor is it possible to manually add a signature via Phar, we use ZipArchive to create a suitable archive for the test on the fly. Closes GH-6474.
* | | Next attempt to fix bug #80368Nikita Popov2020-11-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently treating LibreSSL as OpenSSL 1.1 is not just something we did in our code, it's something that upstream LibreSSL claims, despite not actually being compatible. Duh. Check for EVP_CIPH_OCB_MODE instead, which should reliably determine support...
* | | Fix #76813: Access violation near NULL on source operandChristoph M. Becker2020-11-304-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We avoid `YYCURSOR` becoming `NULL` by initializing `YYMARKER`, and add a default rule for `<NORMAL>` where we catch unexpected input. We also fix the only superficially related issue regarding empty input followed by `T_SEPARATOR` and command, which caused another segfault. Closes GH-6464.
* | | Merge branch 'PHP-7.3' into PHP-7.4Jakub Zelenka2020-11-271-1/+2
|\ \ \ | |/ /
| * | Fix test for bug62890 to not depend on system cert storeJakub Zelenka2020-11-271-1/+2
| | |
* | | Fix build for non-x86Nikita Popov2020-11-271-4/+10
| | |
* | | Fix AVX detectionNikita Popov2020-11-271-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our CPU detection code currently only checks whether hardware support for AVX exists. However, we also need to check for operating system support for XSAVE, as well as whether XCR0 has the SSE and AVX bits set. If this is not the case, unset the AVX and AVX2 bits in the cpuinfo structure. Hopefully this resolves our issues with CPU support detection. Closes GH-6460.
View Lorry Controller Status