summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-011-0/+82
|\
| * Bug #43177: If an eval() has a parse error, the overall exit status and retur...Stanislav Malyshev2013-01-011-0/+82
| * Happy New YearXinchen Hui2013-01-0162-70/+70
* | Happy New YearXinchen Hui2013-01-0162-70/+70
* | Merge branch 'PHP-5.4' into PHP-5.5Lars Strojny2012-12-142-134/+35
|\ \ | |/
| * update test for supported Mime Types checkingpascalc2012-12-141-133/+31
| * update list of common Mime Types in PHP development server to support Web aud...pascalc2012-12-141-1/+4
| * Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2012-11-282-5/+10
| |\
* | \ Merge branch 'PHP-5.3' into PHP-5.5Remi Collet2012-11-282-5/+10
|\ \ \ | | |/ | |/|
| * | Fixed Bug #63581 Possible buffer overflowRemi Collet2012-11-281-3/+4
| * | Fixed Bug #63581 Possible null dereferenceRemi Collet2012-11-281-2/+6
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-141-1/+1
|\ \ \ | | |/ | |/|
| * | Fixed test sapi/cli/tests/006.phptAnatoliy Belsky2012-11-141-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-131-10/+10
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-131-10/+10
| |\ \ | | |/
| | * Enabled apache 2.4 handler build optionPierre Joye2012-11-131-0/+19
* | | Add missed fileXinchen Hui2012-10-241-0/+12
* | | Merge branch '5.4'George Wang2012-10-121-1/+1
|\ \ \
| * \ \ Merge branch '5.3' into 5.4George Wang2012-10-121-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | sapi/litespeed/lsapi_main.c: Fix bug #63228George Wang2012-10-121-1/+1
| | |/
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-103-33/+21
|\ \ \ | |/ /
| * | Implemented FR #63242 (Default error page in PHP built-in web server uses out...Xinchen Hui2012-10-103-33/+21
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-101-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-101-0/+0
| |\ \ | | |/
| | * Remove executable permission on phptXinchen Hui2012-10-101-0/+0
* | | Merge branch 'PHP-5.4'Jerome Loyet2012-09-281-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Jerome Loyet2012-09-281-1/+1
| |\ \ | | |/
| | * Fixed bug #62216Jerome Loyet2012-09-281-1/+1
| | * - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")Jerome Loyet2012-09-281-9/+9
| | * - Fixed bug #62947 (Unneccesary warnings on FPM)Jerome Loyet2012-09-281-5/+5
| | * - add missing php-fpm.service.inJerome Loyet2012-09-281-0/+12
| * | - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")Jerome Loyet2012-09-281-9/+9
| * | Merge branch 'fuckgit' into PHP-5.4Jerome Loyet2012-09-283-5/+674
| |\ \
| | * | - Fixed bug #62947 (Unneccesary warnings on FPM)Jerome Loyet2012-09-281-5/+5
| | * | - Fixed bug #63085 (Systemd integration and daemonize)Jerome Loyet2012-09-289-12/+64
* | | | - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")Jerome Loyet2012-09-281-9/+9
* | | | - Fixed bug #62947 (Unneccesary warnings on FPM)Jerome Loyet2012-09-281-5/+5
* | | | - fix merge (fucking git merging system ... :( )Jerome Loyet2012-09-281-0/+653
* | | | Merge branch 'PHP-5.4'Jerome Loyet2012-09-288-664/+51
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Jerome Loyet2012-09-288-664/+51
| |\ \ \ | | |/ / | |/| / | | |/
| | * - Fixed bug #63085 (Systemd integration and daemonize)Jerome Loyet2012-09-288-12/+52
| | * - Fixed bug #62954 (startup problems fpm / php-fpm)Jerome Loyet2012-09-276-57/+59
* | | Merge branch 'PHP-5.4'Jerome Loyet2012-09-286-57/+59
|\ \ \ | |/ /
| * | - Fixed bug #62954 (startup problems fpm / php-fpm)Jerome Loyet2012-09-286-57/+59
* | | Merge branch 'PHP-5.4'Lars Strojny2012-09-183-0/+48
|\ \ \ | |/ /
| * | Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserverLars Strojny2012-09-183-0/+48
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-09-154-22/+71
|\ \ \ | |/ /
| * | Respond with 501 to unknown request methodsNiklas Lindgren2012-09-154-22/+71
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-09-058-12/+12
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-09-058-12/+12
| |\ \ | | |/