summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Update versions for PHP 7.4.16RC1php-7.4.16RC1Derick Rethans2021-02-161-2/+2
|
* Update versionChristoph M. Becker2021-01-261-3/+3
| | | | That appears to have been forgotten for a while.
* Fixed bug #42560sj-i2021-01-193-4/+18
| | | | | | | | | | | | Check open_basedir after the fallback to the system's temporary directory in tempnam(). In order to preserve the current behavior of upload_tmp_dir (do not check explicitly specified dir, but check fallback), new flags are added to check open_basedir for explicit dir and for fallback. Closes GH-6526.
* Fix #80384: limit read buffer sizeAdam Seitz2020-12-231-1/+2
| | | | | | | | | | | | | 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.
* Fix #77069: stream filter loses final block of dataChristoph M. Becker2020-12-081-1/+1
| | | | | | | | | | | | | | | | | | 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.
* Update version in 7.4 branchDerick Rethans2020-11-071-3/+3
|
* Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2020-09-281-1/+3
|\ | | | | | | | | | | | | | | * PHP-7.3: Update UPGRADING Update NEWS & UPGRADING Do not decode cookie names anymore Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
| * Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2020-09-281-2/+6
| |\ | | | | | | | | | | | | | | | | | | * PHP-7.2: Update NEWS & UPGRADING Do not decode cookie names anymore Fix bug #79601 (Wrong ciphertext/tag in AES-CCM encryption for a 12 bytes IV)
| | * Do not decode cookie names anymoreStanislav Malyshev2020-09-261-2/+6
| | |
| | * bump version to 7.2.34-devRemi Collet2020-08-041-3/+3
| | |
| | * bump version to 7.2.32-devRemi Collet2020-05-121-3/+3
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-231-3/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #76735: Incorrect message in fopen on invalid mode
| * | Fix #76735: Incorrect message in fopen on invalid modeChristoph M. Becker2020-09-231-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | We have to log errors in `stream_opener` callbacks to the wrapper's error log, because otherwise we may pick up an unrelated `errno` or a most generic message. Closes GH-6187.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-221-6/+7
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #76943: Inconsistent stream_wrapper_restore() errors
| * | Fix #76943: Inconsistent stream_wrapper_restore() errorsChristoph M. Becker2020-09-221-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If restoring of any not registered built-in wrapper is requested, the function is supposed to fail with a warning, so we have to check this condition first. Furthermore, to be able to detect whether a built-in wrapper has been changed, it is not sufficient to check whether *any* userland wrapper has been registered, but rather whether the specific wrapper has been modified. Closes GH-6183.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-221-1/+17
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #79423: copy command is limited to size of file it can copy
| * | Fix #79423: copy command is limited to size of file it can copyChristoph M. Becker2020-09-221-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Passing `NULL` as `lpFileSizeHigh` to `GetFileSize()` gives wrong results for files larger than 0xFFFFFFFF bytes. We fix this by using `GetFileSizeEx()`, and let the mapping fail, if the file size is too large for the architecture. Closes GH-5319.
| * | 7.3.24 is nextChristoph M. Becker2020-09-151-3/+3
| | |
* | | Fix mmap copyingChristoph M. Becker2020-09-213-17/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of attempting to map large files into memory at once, we map chunks of at most `PHP_STREAM_MMAP_MAX` bytes, and repeat that until we hit the point where `php_stream_seek()` fails (see bug 54902), and copy the rest of the file by reading and writing small chunks. We also fix the mapping behavior for zero bytes on Windows, which did not error (as with `mmap()`), but would have mapped the remaining file.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-112-4/+12
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #80067: Omitting the port in bindto setting errors
| * | Fix #80067: Omitting the port in bindto setting errorsChristoph M. Becker2020-09-112-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent commit[1] which fixed a memory leak introduced a regression regarding the formerly liberal handling of IP addresses to bind to. We fix this by reverting that commit, and fix the memory leak where it actually occurs. In other words, this fix is less intrusive than the former fix. [1] <http://git.php.net/?p=php-src.git;a=commit;h=0b8c83f5936581942715d14883cdebddc18bad30> Closes GH-6104.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-031-8/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #80048: Bug #69100 has not been fixed for Windows
| * | Fix #80048: Bug #69100 has not been fixed for WindowsChristoph M. Becker2020-09-031-8/+4
| | | | | | | | | | | | | | | | | | We fix the erroneous length calculation on Windows, too. Closes GH-6067.
| * | 7.3.23 is nextChristoph M. Becker2020-08-181-3/+3
| | |
* | | Prepare for 7.4.11Derick Rethans2020-08-181-3/+3
| | |
* | | Use standard types in fopencookie testNikita Popov2020-08-051-1/+1
| | | | | | | | | | | | | | | Instead of internal __size_t / __off64_t types use ssize_t and off64_t. This makes it work on musl as well.
* | | Merge branch 'PHP-7.3' into PHP-7.4twosee2020-07-291-0/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Handle bindto error
| * | Handle bindto errortwosee2020-07-291-0/+4
| | | | | | | | | | | | Closes GH-5903.
| * | 7.3 is now 7.3.22-devChristoph M. Becker2020-07-211-3/+3
| | |
* | | PHP-7.4 is 7.4.10-dev nowDerick Rethans2020-07-261-3/+3
| | |
* | | Update php_version.hChristoph M. Becker2020-07-021-3/+3
| | | | | | | | | | | | That has apparently been overlooked.
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-291-4/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix #79756: finfo_file crash (FILEINFO_MIME)
| * | Fix #79756: finfo_file crash (FILEINFO_MIME)Christoph M. Becker2020-06-291-4/+10
| | | | | | | | | | | | | | | If `ctime` or `asctime` return `NULL`, we must not attempt to copy the buffer, but rather return `NULL` as well.
| * | 7.3 is now 7.3.21-devChristoph M. Becker2020-06-231-3/+3
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-06-091-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix possibly unsupported timercmp() usage
| * | Fix possibly unsupported timercmp() usageChristoph M. Becker2020-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The `timercmp()` manpage[1] points out that some systems have a broken implementation which does not support `>=`. This is definitely the case for the Windows SDK, which only supports `<` and `>`. [1] <https://linux.die.net/man/3/timercmp>
| * | 7.3.20 will be nextChristoph M. Becker2020-05-261-3/+3
| | |
* | | Bump versionChristoph M. Becker2020-05-191-3/+3
| | | | | | | | | | | | Seems that has been forgotten.
* | | Check compatibility with proper runtime DLLChristoph M. Becker2020-05-141-1/+7
| | | | | | | | | | | | | | | In practise, this likely does not matter, because usually these DLLs are installed side by side, but still we should check the proper DLL.
* | | Merge branch 'PHP-7.3' into PHP-7.4Stanislav Malyshev2020-05-111-5/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-7.3: Fix #78876: Long variables cause OOM and temp files are not cleaned Fix #78875: Long filenames cause OOM and temp files are not cleaned Update NEWS for 7.2.31 Update CREDITS for PHP 7.2.30 Update NEWS for PHP 7.2.30
| * | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2020-05-111-5/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * PHP-7.2: Fix #78876: Long variables cause OOM and temp files are not cleaned Fix #78875: Long filenames cause OOM and temp files are not cleaned Update NEWS for 7.2.31 Update CREDITS for PHP 7.2.30 Update NEWS for PHP 7.2.30
| | * Fix #78876: Long variables cause OOM and temp files are not cleanedChristoph M. Becker2020-05-111-3/+3
| | | | | | | | | | | | We use the proper type for size calculations, which is `size_t`.
| | * Fix #78875: Long filenames cause OOM and temp files are not cleanedChristoph M. Becker2020-05-111-2/+3
| | | | | | | | | | | | | | | | | | We must not cast `size_t` to `int` (unless the `size_t` value is guaranteed to be less than or equal to `INT_MAX`). In this case we can declare `array_len` as `size_t` in the first place.
| | * Fixed bug #79468dinosaur2020-04-141-0/+6
| | | | | | | | | | | | Close the stream filter resources when removing them from the stream.
| | * bump verison to 7.2.30-devRemi Collet2020-03-171-3/+3
| | |
| | * bump version to 7.2.29Remi Collet2020-02-181-3/+3
| | |
| | * next will be 7.2.28Remi Collet2020-01-221-3/+3
| | |
| | * next is 7.2.27Remi Collet2019-12-031-3/+3
| | |
| | * Bump for 7.2.26-devSara Golemon2019-11-051-3/+3
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-05-111-3/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix default sendmail path when not found during build
View Lorry Controller Status