Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 1 | -0/+2 | |
|\ \ \ | |/ / | ||||||
| * | | add NEWS | Stanislav Malyshev | 2015-01-31 | 1 | -0/+2 | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 2 | -0/+19 | |
|\ \ \ | |/ / | ||||||
| * | | Added test and possible fix for https://bugs.php.net/bug.php?id=67068 | Danack | 2015-01-31 | 2 | -0/+19 | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2015-01-31 | 7 | -18/+18 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-01-31 | 7 | -18/+18 | |
| |\ \ | | |/ | ||||||
| | * | Use better constant since MAXHOSTNAMELEN may mean shorter name | Stanislav Malyshev | 2015-01-31 | 5 | -12/+16 | |
| | * | 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 | 7 | -5/+50 | |
|\ \ \ | |/ / | ||||||
| * | | Add mitigation for CVE-2015-0235 (bug #68925) | Stanislav Malyshev | 2015-01-31 | 4 | -3/+9 | |
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-01-31 | 4 | -2/+40 | |
| |\ \ | | |/ | ||||||
| | * | Add mitigation for CVE-2015-0235 (bug #68925) | Stanislav Malyshev | 2015-01-31 | 5 | -2/+44 | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2015-02-01 | 1 | -1/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Fixed typo in comment | Yasuo Ohgaki | 2015-02-01 | 1 | -1/+1 | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2015-01-29 | 1 | -1/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Use bash rather than sh | Yasuo Ohgaki | 2015-01-29 | 1 | -1/+1 | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Yasuo Ohgaki | 2015-01-29 | 2 | -1/+4 | |
|\ \ \ | |/ / | ||||||
| * | | Fixed Bug #68941 mod_files.sh is a bash-script | Yasuo Ohgaki | 2015-01-29 | 2 | -1/+4 | |
* | | | Update News | Xinchen Hui | 2015-01-29 | 1 | -0/+3 | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2015-01-29 | 1 | -1/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Fixed bug #68901 (use after free) | Xinchen Hui | 2015-01-29 | 2 | -1/+4 | |
* | | | 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.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 | |
* | | | Update NEWs | Xinchen Hui | 2015-01-27 | 1 | -0/+4 | |
* | | | 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 | 6 | -9/+17 | |
| * | | 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 | |
* | | | | Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 | Bob Weinand | 2015-01-26 | 3 | -1/+60 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Add NEWS entry | Bob Weinand | 2015-01-26 | 1 | -0/+3 | |
| * | | | Fix call after close if multiple filters are attached | Bob Weinand | 2015-01-26 | 2 | -1/+57 | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Keyur Govande | 2015-01-26 | 1 | -0/+6 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Add NEWS | Keyur Govande | 2015-01-26 | 1 | -0/+6 | |
| * | | | Patch commit d9f85373e32 by moving the float_to_double function to | Keyur Govande | 2015-01-26 | 6 | -46/+15 | |
| * | | | Fix for bugs #68114 (Build fails on OS X due to undefined symbols) | Keyur Govande | 2015-01-26 | 9 | -91/+141 | |
* | | | | Patch commit d9f85373e32 by moving the float_to_double function to | Keyur Govande | 2015-01-26 | 6 | -46/+15 | |
* | | | | Fix for bugs #68114 (Build fails on OS X due to undefined symbols) | Keyur Govande | 2015-01-26 | 9 | -91/+141 | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2015-01-22 | 1 | -6/+7 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2015-01-22 | 1 | -6/+7 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | fix some factual errors in the process | Ferenc Kovacs | 2015-01-22 | 1 | -6/+7 | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2015-01-22 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | move CVE to the right version | Remi Collet | 2015-01-22 | 1 | -2/+2 | |
* | | | | Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs | Anatol Belski | 2015-01-22 | 3 | -0/+16 | |
* | | | | Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly | Anatol Belski | 2015-01-22 | 5 | -29325/+28936 | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2015-01-22 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | simplify error handling for dirs as magic | Anatol Belski | 2015-01-22 | 1 | -1/+1 | |
* | | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 | Anatol Belski | 2015-01-22 | 2 | -0/+3 | |
|\ \ \ \ |