Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull-request/884' | Stanislav Malyshev | 2015-02-01 | 1 | -0/+2 |
|\ | |||||
| * | Fix #66479: Wrong response to FCGI_GET_VALUES | Frank Stolle | 2014-10-30 | 1 | -0/+2 |
* | | Merge branch 'pull-request/1011' | Stanislav Malyshev | 2015-02-01 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix for a previous commit. i read it as size_t, notssize_t. | Joshua Rogers | 2015-02-01 | 1 | -3/+3 |
| * | | Remove useless tests | Joshua Rogers | 2015-01-21 | 1 | -5/+5 |
* | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2015-01-31 | 2 | -2/+6 |
|\ \ \ | |||||
| * \ \ | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 2 | -2/+6 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-01-31 | 2 | -2/+6 |
| | |\ \ \ | |||||
| | | * | | | Use better constant since MAXHOSTNAMELEN may mean shorter name | Stanislav Malyshev | 2015-01-31 | 1 | -1/+5 |
| | | * | | | use right sizeof for memset | Stanislav Malyshev | 2015-01-31 | 1 | -1/+1 |
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 1 | -1/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-01-31 | 1 | -1/+5 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Add mitigation for CVE-2015-0235 (bug #68925) | Stanislav Malyshev | 2015-01-31 | 1 | -1/+5 |
* | | | | | | Add mitigation for CVE-2015-0235 (bug #68925) | Stanislav Malyshev | 2015-01-31 | 1 | -2/+6 |
* | | | | | | Merge branch 'incorrect_close' of github.com:MegaManSec/php-src | Michael Wallner | 2015-01-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use correct deallocator in phpdbg | Joshua Rogers | 2015-01-27 | 1 | -1/+1 |
* | | | | | | | Squashed commit of the following: | Michael Wallner | 2015-01-30 | 1 | -1/+0 |
* | | | | | | | fix datatype mismatches, improve error checks | Anatol Belski | 2015-01-30 | 2 | -14/+32 |
* | | | | | | | Fixed bug #68945 (Unknown admin values segfault pools) | Xinchen Hui | 2015-01-30 | 1 | -1/+1 |
* | | | | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2015-01-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-01-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | fcgi_write in fpm returns ssizt_t, but it returns int in cgi | Xinchen Hui | 2015-01-27 | 1 | -1/+1 |
* | | | | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2015-01-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-01-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Revert previous unintentional change to this | Xinchen Hui | 2015-01-27 | 1 | -0/+1 |
* | | | | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2015-01-27 | 5 | -4/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | |||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-01-27 | 5 | -4/+12 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Also Fixed #68571 in CGI SAPI, and some cleanup | Xinchen Hui | 2015-01-27 | 5 | -9/+12 |
| | * | | | | Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src int... | Xinchen Hui | 2015-01-27 | 2 | -1/+6 |
| | |\ \ \ \ | |||||
| | | * | | | | follow C89 format | redfoxli | 2014-12-10 | 1 | -1/+2 |
| | | * | | | | fix-bug-68571-to-php5.5 | redfoxli | 2014-12-09 | 2 | -1/+5 |
| | * | | | | | Bump year | Xinchen Hui | 2015-01-15 | 66 | -77/+77 |
| | * | | | | | Fix bug #68784 | Rasmus Lerdorf | 2015-01-09 | 1 | -1/+1 |
| * | | | | | | Slightly modify and merge PR#105 from @MegaManSec | Rasmus Lerdorf | 2015-01-21 | 2 | -0/+3 |
| * | | | | | | bump year | Xinchen Hui | 2015-01-15 | 99 | -111/+111 |
| * | | | | | | Fix bug #68784 | Rasmus Lerdorf | 2015-01-09 | 1 | -1/+1 |
* | | | | | | | Remove dl() on fpm-fcgi | Nikita Popov | 2015-01-26 | 1 | -12/+1 |
* | | | | | | | zend_read_property() has to provide a holder for return value. | Dmitry Stogov | 2015-01-22 | 1 | -2/+2 |
* | | | | | | | Slightly modify and merge PR#105 from @MegaManSec | Rasmus Lerdorf | 2015-01-21 | 2 | -0/+3 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Remove dead codes | Xinchen Hui | 2015-01-19 | 1 | -36/+3 |
* | | | | | | Weird, is nobody compiling this? | Rasmus Lerdorf | 2015-01-15 | 1 | -2/+2 |
* | | | | | | bump year | Xinchen Hui | 2015-01-15 | 113 | -126/+126 |
* | | | | | | Faster sorting algo | Xinchen Hui | 2015-01-14 | 4 | -5/+5 |
* | | | | | | Fixed #68790 (Missing return) | Xinchen Hui | 2015-01-10 | 1 | -1/+1 |
* | | | | | | trailing whitespace removal | Stanislav Malyshev | 2015-01-10 | 72 | -972/+972 |
* | | | | | | Fix bug #68784 | Rasmus Lerdorf | 2015-01-09 | 1 | -1/+1 |
* | | | | | | These tests all assume that IPV6 is available. | Rasmus Lerdorf | 2015-01-09 | 5 | -5/+20 |
* | | | | | | Merge branch 'PHP-5.6' | Remi Collet | 2015-01-06 | 1 | -2/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2015-01-06 | 1 | -2/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | cleanup old unused typedef | Remi Collet | 2015-01-06 | 1 | -2/+0 |