summaryrefslogtreecommitdiff
path: root/main/streams
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Daniel Lowrey2014-02-201-14/+21
|\
| * Use crypto method flags; add tlsv1.0 wrapper; add wrapper testsDaniel Lowrey2014-02-201-14/+21
* | Merge branch 'PHP-5.6'Xinchen Hui2014-01-0318-18/+18
|\ \ | |/
| * Bump yearXinchen Hui2014-01-0318-18/+18
* | Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to itKalle Sommer Nielsen2013-12-183-4/+3
* | Eliminate another TSRMLS_FETCH() in i_zend_is_true()Kalle Sommer Nielsen2013-12-181-2/+2
|/
* Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2013-12-121-1/+1
|\
| * Fixed bug #65486 mysqli_poll() is broken on Win x64Anatol Belski2013-12-121-1/+1
* | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2013-12-061-5/+7
|\ \ | |/
| * Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-12-061-5/+7
| |\
| | * Fixed bug #61645 (fopen and O_NONBLOCK)Michael Wallner2013-12-061-5/+7
* | | 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
* | | | 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
|/ /
* | Merge branch 'PHP-5.4' into PHP-5.5Matteo Beccati2013-07-191-1/+1
|\ \ | |/
| * 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
|\ \ | |/
| * 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
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Matteo Beccati2013-06-141-3/+11
| |\
| | * 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
* | | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-04-021-2/+4
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | fix commentRemi Collet2013-04-021-3/+1
| * | Fixed Bug #64565 copy doesn't report failure on partial copyRemi Collet2013-04-021-5/+4
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-271-1/+1
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Gustavo Lopes2012-10-121-2/+10
| |\ \ | | |/
| | * Fix bug #63240 on stream_get_line()Gustavo Lopes2012-10-121-2/+10
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-093-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-093-0/+0
| |\ \ | | |/
| | * Fixed bug #63236 (Executable permission on various source files)Xinchen Hui2012-10-093-0/+0
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-08-091-117/+80
|\ \ \ | |/ /
| * | fix bug #40459 - make all stream funcs that create object call ctorStanislav Malyshev2012-08-071-117/+80
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-081-0/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-06-081-0/+5
| |\ \ | | |/
| | * 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
|\ \ \ | |/ /
| * | fix potential overflow in _php_stream_scandirStanislav Malyshev2012-06-071-3/+8