summaryrefslogtreecommitdiff
path: root/main/streams/streams.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix stream_select() issue with OpenSSL bufferChris Wright2015-03-051-4/+4
| | | | | | | | | | | | Ensure data from OpenSSL internal buffer has been transfered to PHP stream buffer before a select() emulation operation is performed Addresses bug #65137 https://bugs.php.net/bug.php?id=65137 Conflicts: ext/openssl/xp_ssl.c
* bump yearXinchen Hui2015-01-151-1/+1
|
* Revert "Merge branch 'PHP-5.4' into PHP-5.5"Ferenc Kovacs2014-10-151-4/+4
| | | | | This reverts commit 30a73658c63a91c413305a4c4d49882fda4dab3e, reversing changes made to 7fac56e0729385bbd2bb040f06a20a697d9de5fd.
* Merge branch 'PHP-5.5' into PHP-5.6Chris Wright2014-08-271-4/+4
|\ | | | | | | | | * PHP-5.5: Fix stream_select() issue with OpenSSL buffer
| * Merge branch 'PHP-5.4' into PHP-5.5Chris Wright2014-08-271-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix stream_select() issue with OpenSSL buffer Conflicts: ext/openssl/xp_ssl.c
| | * Fix stream_select() issue with OpenSSL bufferChris Wright2014-08-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure data from OpenSSL internal buffer has been transfered to PHP stream buffer before a select() emulation operation is performed Addresses bug #65137 https://bugs.php.net/bug.php?id=65137 Conflicts: ext/openssl/xp_ssl.c
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-201-22/+26
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix bug #65701: Do not use cache for file file copy
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-201-22/+26
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fix bug #65701: Do not use cache for file file copy
| | * Fix bug #65701: Do not use cache for file file copyBoro Sitnikovski2014-04-201-22/+26
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-031-2/+7
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: NEWS Fix Bug #66736 fpassthru broken
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-04-031-2/+7
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fix Bug #66736 fpassthru broken
| | * Fix Bug #66736 fpassthru brokenMichael Wallner2014-04-031-2/+7
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-021-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: NEWS Fixed bug #61019 (Out of memory on command stream_get_contents)
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-04-021-0/+4
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fixed bug #61019 (Out of memory on command stream_get_contents)
| | * Fixed bug #61019 (Out of memory on command stream_get_contents)Michael Wallner2014-04-021-0/+4
| | |
| | * Bump yearXinchen Hui2014-01-031-1/+1
| | |
| * | Bump yearXinchen Hui2014-01-031-1/+1
| | |
* | | Bump yearXinchen Hui2014-01-031-1/+1
| | |
* | | Constify streams API and a few other calls down the rabbit hole.Andrey Hristov2013-07-301-31/+31
|/ / | | | | | | | | (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-101-1/+3
|\ \ | |/ | | | | | | * PHP-5.4: fix possible resource leak and make sure there's something to qsort()
| * fix possible resource leak and make sure there's something to qsort()Anatol Belski2013-07-101-1/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-04-021-2/+4
|\ \ | |/ | | | | | | * PHP-5.4: keep previous test to avoid any behavior change
| * keep previous test to avoid any behavior changeRemi Collet2013-04-021-2/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-04-021-8/+5
|\ \ | |/ | | | | | | | | * PHP-5.4: fix comment Fixed Bug #64565 copy doesn't report failure on partial copy
| * fix commentRemi Collet2013-04-021-3/+1
| |
| * Fixed Bug #64565 copy doesn't report failure on partial copyRemi Collet2013-04-021-5/+4
| | | | | | | | | | | | | | | | | | _php_stream_copy_to_stream_ex, when mmap is possible, doesn't check if actually written bytes match read bytes. Fix this (paranoid check) to be consistent with non mmap mode Seems hard to add a unit test, as this rely on a full filesystem.
| * Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Merge branch 'PHP-5.4'Gustavo Lopes2012-10-121-2/+10
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #63240 on stream_get_line()
| * Merge branch 'PHP-5.3' into PHP-5.4Gustavo Lopes2012-10-121-2/+10
| |\ | | | | | | | | | | | | * PHP-5.3: Fix bug #63240 on stream_get_line()
| | * Fix bug #63240 on stream_get_line()Gustavo Lopes2012-10-121-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stream_get_line() could contain the delimiter string if that string had more than one character. The bug manifested itself when a read on the stream ended with part of the delimiter string and the read after would start with the rest of the delimiter string; provided that the data of first read did not complete the max length result of the call to stream_get_line() with the partial delimiter used in that max length return. In that case, the delimiter will still appear in the result, divided in two subsequent return values. That is not a bug. See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html>
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-091-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-091-0/+0
| |\ \ | | |/
| | * Fixed bug #63236 (Executable permission on various source files)Xinchen Hui2012-10-091-0/+0
| | |
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-081-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.4: improve overflow checks add NEWS fix potential overflow in _php_stream_scandir
| * | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-06-081-0/+5
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.3: improve overflow checks fix potential overflow in _php_stream_scandir
| | * improve overflow checksStanislav Malyshev2012-06-081-5/+5
| | |
| | * fix potential overflow in _php_stream_scandirStanislav Malyshev2012-06-071-3/+8
| | |
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-071-3/+8
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: fix potential overflow in _php_stream_scandir
| * | fix potential overflow in _php_stream_scandirStanislav Malyshev2012-06-071-3/+8
| | |
* | | Merge branch 'PHP-5.4'Nikita Popov2012-05-061-1/+6
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: Add NEWS entry for bug #61961 Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
| * | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-05-061-1/+6
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.3: Add NEWS entry for bug #61961 Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
| | * Fixed Bug #61961 (file_get_content leaks when access empty file with max length)Reeze Xia2012-05-061-1/+6
| | |
* | | Merge branch '5.4'Gustavo André dos Santos Lopes2012-04-071-2/+2
|\ \ \ | |/ /
| * | Merge branch '5.3' into 5.4Gustavo André dos Santos Lopes2012-04-071-2/+2
| |\ \ | | |/
| | * Fixed bug in new stream_get_line() when using NUL as a delimiter.Gustavo André dos Santos Lopes2012-04-071-2/+2
| | | | | | | | | | | | This is the issue Derick spotted a few days ago..
| | * - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leakGustavo André dos Santos Lopes2012-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition for deleting the context was too broad) and so prevents segfaults in new circumstances (where the inhibition was not broad enough).
| | * - Oops committed old version of the patch in r324020. Fixed. See bug #61253.Gustavo André dos Santos Lopes2012-03-081-1/+1
| | |
| | * - Fixed bug #61253: Wrappers opened with errors concurrency problemGustavo André dos Santos Lopes2012-03-081-38/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #NOTE: There is a very small possibility that this will further break #extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the #only one and it may leak memory after this. I say "further break" because #extensions that do that are already broken (will segfault) under ZTS, which is #why this patch is necessary. #There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
| | * - Better fix for #61115.Gustavo André dos Santos Lopes2012-02-241-3/+8
| | | | | | | | | | | | | | | - Fixed resource leak in stream_socket_client().
View Lorry Controller Status