summaryrefslogtreecommitdiff
path: root/main/streams
Commit message (Collapse)AuthorAgeFilesLines
* Change Zend Stream API to use zend_string* instead of char*.Dmitry Stogov2021-03-161-1/+9
| | | | | This allows to eliminate re-calculation of string lenght and hash value. See the detailed list of changes in UPGRADING.INTERNALS.
* Improve SPL directory and stat() cache using zend_srting* instead of char*Dmitry Stogov2021-02-262-41/+8
|
* Merge branch 'PHP-8.0'Christoph M. Becker2021-02-221-1/+1
|\ | | | | | | | | * PHP-8.0: Fix #75776: Flushing streams with compression filter is broken
| * Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2021-02-221-1/+1
| |\ | | | | | | | | | | | | * PHP-7.4: Fix #75776: Flushing streams with compression filter is broken
| | * Fix #75776: Flushing streams with compression filter is brokenChristoph M. Becker2021-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Replace zend_bool uses with boolNikita Popov2021-01-152-2/+2
| | | | | | | | | | | | | | | | | | | | | We're starting to see a mix between uses of zend_bool and bool. Replace all usages with the standard bool type everywhere. Of course, zend_bool is retained as an alias.
* | | Merge branch 'PHP-8.0'Christoph M. Becker2020-12-231-1/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fix #80384: limit read buffer size
| * | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-12-231-1/+2
| |\ \ | | |/ | | | | | | | | | * PHP-7.4: Fix #80384: limit read buffer size
| | * 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.
* | | Back memory stream by a zend_stringNikita Popov2020-12-181-68/+39
| | | | | | | | | | | | | | | | | | This allows reusing an existing zend_string inside a memory stream without reallocating. For non-readonly streams, the string will only get separated on write.
* | | Remove unused smax member from memory streamNikita Popov2020-12-181-2/+0
| | |
* | | Merge branch 'PHP-8.0'Christoph M. Becker2020-12-081-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fix #77069: stream filter loses final block of data
| * | Merge branch 'PHP-7.4' into PHP-8.0Christoph M. Becker2020-12-081-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.4: Fix #77069: stream filter loses final block of data
| | * 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.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-11-302-5/+12
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Suppress stream errors in mysqlnd
| * | Suppress stream errors in mysqlndNikita Popov2020-11-302-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqlnd currently sets error_reporting=0 to suppress errors while writing to streams. Unfortunately these errors are still visible to userland error handlers, which is a source of confusion. See for example https://bugs.php.net/bug.php?id=80412. Instead add a stream flag that suppresses the emission of read/write errors in the first place, and set it in mysqlnd. I think it might be useful to have this option for userland as well in the future, but for now this is just an internal mechanism. Closes GH-6458.
* | | Suppress bogus [-Wlogical-op] warning from GCCGeorge Peter Banyard2020-10-102-4/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 which emits the warning for (errno == EWOULDBLOCK || errno == EAGAIN) which is the correct way of handling errors as the value of EWOULDBLOCK and EAGAIN is implementation defined. Therefore introduce a new macro function PHP_IS_TRANSIENT_ERROR() which handles the case when EWOULDBLOCK and EAGAIN are identical. Thanks to @twose for the idea.
* | Clear error flag instead of toggling itChristoph M. Becker2020-09-231-6/+6
| | | | | | | | | | | | | | The toggling of the `REPORT_ERRORS` looks fishy, and likely was intented as clearing. Closes GH-6190.
* | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-231-3/+1
|\ \ | |/ | | | | | | * PHP-7.4: Fix #76735: Incorrect message in fopen on invalid mode
| * 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.4' into masterChristoph M. Becker2020-09-221-6/+7
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #76943: Inconsistent stream_wrapper_restore() errors
| * | 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.4' into masterChristoph M. Becker2020-09-221-1/+17
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #79423: copy command is limited to size of file it can copy
| * | 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.
* | | Merge branch 'PHP-7.4' into masterChristoph M. Becker2020-09-213-17/+43
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix mmap copying
| * | 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.4' into masterChristoph M. Becker2020-09-111-4/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #80067: Omitting the port in bindto setting errors
| * | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-09-111-4/+0
| |\ \ | | |/ | | | | | | | | | * PHP-7.3: Fix #80067: Omitting the port in bindto setting errors
| | * Fix #80067: Omitting the port in bindto setting errorsChristoph M. Becker2020-09-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.4' into masterChristoph M. Becker2020-09-031-8/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Fix #80048: Bug #69100 has not been fixed for Windows
| * | 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.
| * | 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.
* | | 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.
* | | ValueError for empty path in stream codeGeorge Peter Banyard2020-07-311-1/+1
| | | | | | | | | | | | Closes GH-5902
* | | Merge branch 'PHP-7.4'twosee2020-07-291-0/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Handle bindto error
| * | 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.
* | | Refactor user streams to use ZPP class checkGeorge Peter Banyard2020-07-281-43/+38
| | | | | | | | | | | | Closes GH-5876
* | | Simplify user_stream_create_objectNikita Popov2020-07-231-22/+2
| | |
* | | Support socketpairs in proc_open()Martin Schröder2020-07-141-0/+5
| | | | | | | | | | | | Closes GH-5777.
* | | Review the usage of apostrophes in error messagesMáté Kocsis2020-07-101-1/+1
| | | | | | | | | | | | Closes GH-5590
* | | Remove no_separation flagNikita Popov2020-07-071-1/+0
| | |
* | | Remove proto comments from C filesMax Semenik2020-07-062-16/+8
| | | | | | | | | | | | Closes GH-5758
* | | Avoid some unnecessary uses of no_separation=0Nikita Popov2020-07-061-41/+30
| | | | | | | | | | | | | | | For the rare cases where references are part of the API, construct them explicitly. Otherwise do not allow separation.
* | | Correct comment in plain_wrapper.c (refers to microseconds, not milliseconds)Alex Dowad2020-06-241-1/+1
| | |
* | | Constify char * arguments of APIstwosee2020-06-081-3/+3
| | | | | | | | | | | | Closes GH-5676.
View Lorry Controller Status