Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-20 | 1 | -22/+26 |
|\ | |||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-20 | 1 | -22/+26 |
| |\ | |||||
| | * | Fix bug #65701: Do not use cache for file file copy | Boro Sitnikovski | 2014-04-20 | 1 | -22/+26 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Michael Wallner | 2014-04-03 | 1 | -2/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2014-04-03 | 1 | -2/+7 |
| |\ \ | | |/ | |||||
| | * | Fix Bug #66736 fpassthru broken | Michael Wallner | 2014-04-03 | 1 | -2/+7 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Michael Wallner | 2014-04-02 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2014-04-02 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #61019 (Out of memory on command stream_get_contents) | Michael Wallner | 2014-04-02 | 1 | -0/+4 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Michael Wallner | 2014-04-02 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2014-04-02 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | Fix bug #64330 | Michael Wallner | 2014-04-02 | 1 | -1/+2 |
| | * | Bump year | Xinchen Hui | 2014-01-03 | 18 | -18/+18 |
| * | | Bump year | Xinchen Hui | 2014-01-03 | 18 | -18/+18 |
* | | | Fixes to various stream cast on win64 | Anatol Belski | 2014-03-19 | 1 | -6/+6 |
* | | | Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests | Daniel Lowrey | 2014-02-20 | 1 | -14/+21 |
* | | | Bump year | Xinchen Hui | 2014-01-03 | 18 | -18/+18 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2013-12-12 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #65486 mysqli_poll() is broken on Win x64 | Anatol Belski | 2013-12-12 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Michael Wallner | 2013-12-06 | 1 | -5/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2013-12-06 | 1 | -5/+7 |
| |\ \ | | |/ | |||||
| | * | Fixed bug #61645 (fopen and O_NONBLOCK) | Michael Wallner | 2013-12-06 | 1 | -5/+7 |
* | | | Merge branch 'bug50333' of github.com:weltling/php-src into bug50333 | Anatol Belski | 2013-10-29 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | applied and fixed the original patch | Anatol Belski | 2013-10-17 | 1 | -1/+1 |
* | | | | Added support for TLSv1.1 and TLSv1.2 | Daniel Lowrey | 2013-10-08 | 1 | -1/+5 |
|/ / / | |||||
* | | | Constify streams API and a few other calls down the rabbit hole. | Andrey Hristov | 2013-07-30 | 9 | -83/+92 |
|/ / | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Matteo Beccati | 2013-07-19 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Properly fixed bug #63186 on NetBSD == 6.0 | Matteo Beccati | 2013-07-19 | 1 | -1/+1 |
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-07-10 | 1 | -1/+3 |
|\ \ | |/ | |||||
| * | fix possible resource leak and make sure there's something to qsort() | Anatol Belski | 2013-07-10 | 1 | -1/+3 |
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Matteo Beccati | 2013-06-14 | 1 | -3/+11 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Matteo Beccati | 2013-06-14 | 1 | -3/+11 |
| |\ | |||||
| | * | Fixed bug #63186 (compile failure on netbsd) | Matteo Beccati | 2013-06-14 | 1 | -3/+11 |
| | * | Happy New Year~ | Xinchen Hui | 2013-01-01 | 18 | -18/+18 |
| * | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -1/+1 |
* | | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-04-02 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | keep previous test to avoid any behavior change | Remi Collet | 2013-04-02 | 1 | -2/+4 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-04-02 | 1 | -8/+5 |
|\ \ \ | |/ / | |||||
| * | | fix comment | Remi Collet | 2013-04-02 | 1 | -3/+1 |
| * | | Fixed Bug #64565 copy doesn't report failure on partial copy | Remi Collet | 2013-04-02 | 1 | -5/+4 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-01-27 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fix missing parameter | Andras Elso | 2013-01-27 | 1 | -1/+1 |
| * | | Happy New Year | Xinchen Hui | 2013-01-01 | 18 | -18/+18 |
* | | | Happy New Year | Xinchen Hui | 2013-01-01 | 18 | -18/+18 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Rasmus Lerdorf | 2012-12-19 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fix for bug #63811 | Rasmus Lerdorf | 2012-12-19 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' | Gustavo Lopes | 2012-10-12 | 1 | -2/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Gustavo Lopes | 2012-10-12 | 1 | -2/+10 |
| |\ \ | | |/ | |||||
| | * | Fix bug #63240 on stream_get_line() | Gustavo Lopes | 2012-10-12 | 1 | -2/+10 |