summaryrefslogtreecommitdiff
path: root/main/streams/streams.c
Commit message (Collapse)AuthorAgeFilesLines
* 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().
| | * - Fixed bug #61115 (stream related segfault on fatal error inGustavo André dos Santos Lopes2012-02-221-3/+5
| | | | | | | | | | | | | | | | | | | | | php_stream_context_link). #run-tests.php is not currently detecting the segfault in the test #Missing 5.4 merge
| | * - Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detectedGustavo André dos Santos Lopes2012-01-221-48/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | together with the last read). - Fixed bug #60817 (stream_get_line() reads from stream even when there is already sufficient data buffered). stream_get_line() now behaves more like fgets(), as is documented. #withheld commit to 5.4
| | * - Year++Felipe Pena2012-01-011-1/+1
| | |
| | * - Fixed bug #60455: stream_get_line misbehaves if EOF is not detected togetherGustavo André dos Santos Lopes2011-12-111-3/+2
| | | | | | | | | | | | | | | with the last read.
| | * - Fixed bug #52935 (call exit in user_error_handler cause stream relate core).Gustavo André dos Santos Lopes2011-07-051-0/+10
| | |
| | * Fixed bug #51997 (SEEK_CUR with 0 value, returns a warning).Ilia Alshanetsky2011-06-051-1/+1
| | |
| | * Fixed bug #54946 (stream_get_contents infinite loop)Hannes Magnusson2011-05-291-0/+3
| | |
| | * - Merged to 5.3 change in trunk in _php_stream_free. This prevents the segfaultGustavo André dos Santos Lopes2011-05-081-1/+6
| | | | | | | | | | | | | | | | | | in the testcase for bug #53624. The testcase still has to be fixed though, because it only works as intended on Windows.
| | * - Fixed accidental change.Gustavo André dos Santos Lopes2011-05-011-1/+1
| | |
| | * - Fixed bug #54623 (Segfault when when writing to a persistent socket afterGustavo André dos Santos Lopes2011-05-011-3/+26
| | | | | | | | | | | | | | | closing a copy of the socket).
| | * - Fixed several comparisons that always result in true of falseGustavo André dos Santos Lopes2011-02-011-10/+14
| | | | | | | | | | | | | | | | | | | | | due to signedness of one of the operands, either by removing dead code or fixing it. - Thrown some comments around in php_stream_get_record. - See http://www.mail-archive.com/internals@lists.php.net/msg49525.html
| | * - Year++Felipe Pena2011-01-011-1/+1
| | |
| | * - Fixed bug #52820 (writes to fopencookie FILE* not commited when seeking theGustavo André dos Santos Lopes2010-11-151-0/+5
| | | | | | | | | | | | stream).
| | * - Fixed forward stream seeking emulation in streams that don't support seekingGustavo André dos Santos Lopes2010-10-131-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | in situations where the read operation gives back less data than requested and when there was data in the buffer before the emulation started. Also made more consistent its behavior -- should return failure every time less data than was requested was skipped. - Small performance improvement by correcting off-by-one error that generate an invalid call to the seek handler or read handler. in _php_stream_seek.
| | * - #51854, fix logic (patch by Tjerk)Pierre Joye2010-05-181-1/+1
| | |
| | * fix buildAntony Dovgal2010-04-081-1/+1
| | |
| | * - WSPierre Joye2010-04-081-27/+27
| | |
| * | MFH: 45a6f8d for 5.4.Gustavo André dos Santos Lopes2012-03-191-48/+82
| | | | | | | | | | | | | | | | | | | | | | | | - Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected together with the last read). - Fixed bug #60817 (stream_get_line() reads from stream even when there is already sufficient data buffered). stream_get_line() now behaves more like fgets(), as is documented.
| * | - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leakGustavo André dos Santos Lopes2012-03-171-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | - Year++Felipe Pena2012-01-011-1/+1
| | |
| * | - Fixed bug #60455: stream_get_line misbehaves if EOF is not detected togetherGustavo André dos Santos Lopes2011-12-111-3/+2
| | | | | | | | | | | | | | | with the last read.
| * | - Fixed borked refactoring in r307437 (using SUCCESS/FAILURE return instead ofGustavo André dos Santos Lopes2011-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | out parameter). - Fixed signature of php_stream_copy_to_stream_ex to return int in 5.4/trunk instead of size_t, as the function only returns SUCCESS/FAILURE.
| * | - Fixed bug #52935 (call exit in user_error_handler cause stream relate core).Gustavo André dos Santos Lopes2011-07-051-0/+10
| | |
| * | Fixed bug #51997 (SEEK_CUR with 0 value, returns a warning).Ilia Alshanetsky2011-06-051-1/+1
| | |
| * | Fixed bug #54946 (stream_get_contents infinite loop)Hannes Magnusson2011-05-291-0/+3
| | |