summaryrefslogtreecommitdiff
path: root/main/streams
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-021-1/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix bug #64330
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-04-021-1/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fix bug #64330
| | * Fix bug #64330Michael Wallner2014-04-021-1/+2
| | | | | | | | | | | | stream_socket_server() creates wrong Abstract Namespace UNIX sockets
| | * Bump yearXinchen Hui2014-01-0318-18/+18
| | |
| * | Bump yearXinchen Hui2014-01-0318-18/+18
| | |
* | | Fixes to various stream cast on win64Anatol Belski2014-03-191-6/+6
| | | | | | | | | | | | | | | | | | This fixes further issues on win64 with casts from the streams. Sockets/descriptors handling was unitized. This has an impact only on win64, php_socket_t otherwise can be feed back to int datatype.
* | | Use crypto method flags; add tlsv1.0 wrapper; add wrapper testsDaniel Lowrey2014-02-201-14/+21
| | |
* | | Bump yearXinchen Hui2014-01-0318-18/+18
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-121-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed bug #65486 mysqli_poll() is broken on Win x64
| * | Fixed bug #65486 mysqli_poll() is broken on Win x64Anatol Belski2013-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this issue is visible in mysqli_poll() functions, the cause lays deeper in the stream to socket casting API. On Win x64 the SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like it's 32 bit signed integer. The game of casting 32 bit var to/from 64 bit pointer back and forth is the best way to break it. Further more, while socket and file descriptors are always integers on Linux, those are different things using different APIs on Windows. Even though using integer instead of SOCKET might work on Windows, this issue might need to be revamped more carefully later. By this time this patch is tested well with phpt and apps and shows no regressions, neither in mysqli_poll() nor in any other parts.
* | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2013-12-061-5/+7
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: Fixed bug #61645 (fopen and O_NONBLOCK) fix possibly uninitialized value
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-061-5/+7
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.4: Fixed bug #61645 (fopen and O_NONBLOCK) fix possibly uninitialized value
| | * Fixed bug #61645 (fopen and O_NONBLOCK)Michael Wallner2013-12-061-5/+7
| | | | | | | | | | | | | | | | | | if a mode like "rn" was passed to fopen(), then php_stream_parse_fopen_modes() would assign O_WRONLY to flags, because O_NONBLOCK tainted flags for the r/w/+ check
* | | Merge branch 'bug50333' of github.com:weltling/php-src into bug50333Anatol Belski2013-10-291-1/+1
|\ \ \
| * | | applied and fixed the original patchAnatol Belski2013-10-171-1/+1
| | | | | | | | | | | | | | | | initial work on the patch import done
* | | | Added support for TLSv1.1 and TLSv1.2Daniel Lowrey2013-10-081-1/+5
|/ / /
* | | Constify streams API and a few other calls down the rabbit hole.Andrey Hristov2013-07-309-83/+92
|/ / | | | | | | | | (`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.5Matteo Beccati2013-07-191-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: Properly fixed bug #63186 on NetBSD == 6.0
| * Properly fixed bug #63186 on NetBSD == 6.0Matteo Beccati2013-07-191-1/+1
| |
* | 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.5Matteo Beccati2013-06-141-3/+11
|\ \ | |/ | | | | | | * PHP-5.4: Fixed bug #63186 (compile failure on netbsd)
| * Merge branch 'PHP-5.3' into PHP-5.4Matteo Beccati2013-06-141-3/+11
| |\ | | | | | | | | | | | | * PHP-5.3: Fixed bug #63186 (compile failure on netbsd)
| | * Fixed bug #63186 (compile failure on netbsd)Matteo Beccati2013-06-141-3/+11
| | |
| | * Happy New Year~Xinchen Hui2013-01-0118-18/+18
| | |
| * | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | | 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.
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fix missing parameter
| * | Fix missing parameterAndras Elso2013-01-271-1/+1
| | |
| * | Happy New YearXinchen Hui2013-01-0118-18/+18
| | |
* | | Happy New YearXinchen Hui2013-01-0118-18/+18
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2012-12-191-1/+1
|\ \ \ | |/ /
| * | Fix for bug #63811Rasmus Lerdorf2012-12-191-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>