summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* There should been memory leaks(and don't use pointer cast)Xinchen Hui2014-05-082-5/+9
* Added support for apache and apache2handler SAPIs (They seem slower than Fast...Dmitry Stogov2014-05-065-55/+58
* Merge branch 'master' into refactoring2Dmitry Stogov2014-05-056-12/+79
|\
| * Merge branch 'PHP-5.6'Bob Weinand2014-05-031-1/+1
| |\
| | * Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-05-031-1/+1
| | * Added stdion/stdout/stderr constsnts and their php:// wrappersBob Weinand2014-05-011-0/+66
| * | Merge sapi/phpdbgBob Weinand2014-05-011-0/+66
| * | Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-292-3/+3
| |\ \ | | |/
| | * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-292-3/+3
| | |\
| | | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-292-3/+3
| | | |\
| | | | * Fix bug #67060: use default mode of 660Stanislav Malyshev2014-04-292-3/+3
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-04-271-2/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'phpdbg/master' into PHP-5.6Anatol Belski2014-04-271-2/+4
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-04-262-6/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'phpdbg/master' into PHP-5.6Anatol Belski2014-04-262-6/+5
* | | | | Get php-fpm to workNikita Popov2014-05-046-136/+97
* | | | | Fix php-cgi -mNikita Popov2014-05-011-3/+4
* | | | | Split IS_BOOL into IS_FALSE and IS_TRUEDmitry Stogov2014-04-301-1/+1
* | | | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-2675-2460/+9305
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-04-247-17/+2026
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'phpdbg/master' into PHP-5.6Anatol Belski2014-04-247-17/+2026
| * | | | Merge branch 'PHP-5.6'Felipe Pena2014-04-221-1/+1
| |\ \ \ \ | | |/ / /
| | * | | sapi/litespeed/lsapi_main.c: Fix bug #63228George Wang2014-04-221-1/+1
| * | | | Merge branch 'PHP-5.6'Bob Weinand2014-04-2139-2023/+6802
| |\ \ \ \ | | |/ / /
| | * | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-04-2139-2023/+6802
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-201-1/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-201-1/+5
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-201-1/+5
| | | |\ \ | | | | |/
| | | | * Fix #66908: php-fpm reload leaks epoll_create() file descriptorJulio Pintos2014-04-201-1/+5
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-04-161-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-04-161-0/+3
| | |\ \ \ | | | |/ /
| | | * | Fixed bug #67079 Missing MIME types for XML/XSL filesAnatol Belski2014-04-161-0/+3
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-131-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-1/+1
| | | |\ \ | | | | |/
| | | | * Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in...itxx002014-04-131-1/+1
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-04-131-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-1/+1
| | | |\ \ | | | | |/
| | | | * fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cceJeff Trawick2014-04-131-1/+1
| * | | | Merge branch 'PHP-5.6'Bob Weinand2014-04-112-3/+3
| |\ \ \ \ | | |/ / /
| | * | | Shut up, my lovely compiler; I do not like your warningsBob Weinand2014-04-112-3/+3
| * | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-04-071-1/+1
| |\ \ \ \ | | |/ / /
| | * | | add missing skip to the output, so we actually skip this testFerenc Kovacs2014-04-071-1/+1
| * | | | Merge branch 'PHP-5.6'Michael Wallner2014-03-242-37/+30
| |\ \ \ \ | | |/ / /
| | * | | fix some warningsMichael Wallner2014-03-241-5/+1
| | * | | PHP-5.6 compatibility for apache2 filter SAPIMichael Wallner2014-03-242-34/+31
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-03-241-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-03-241-0/+2
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-03-241-0/+2
| | | |\ \ | | | | |/