summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | Update LiteSpeed SAPI code to V6.4George Wang2014-07-104-1172/+2755
| | | * | Fixed typo in Makefile.fragGeorge Wang2014-07-101-1/+1
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-07-081-0/+4
| | | |\ \ | | | | |/
| | | | * Fix Bug #67530 error_log=syslog ignoredRemi Collet2014-07-081-0/+4
| | * | | update year & copyrightGeorge Wang2014-07-104-15/+60
| * | | | cleanup file headers.George Wang2014-07-102-16/+0
| * | | | Do not kill children process in pre-fork mode when parent process quit.George Wang2014-07-101-2/+2
| * | | | update year & copyrightGeorge Wang2014-07-104-15/+60
* | | | | Merge branch 'master' into phpngXinchen Hui2014-07-091-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-07-081-0/+4
| |\ \ \ \ | | |/ / /
| | * | | 5.6 have fpm_globals.force_stderrRemi Collet2014-07-081-1/+1
| | * | | Fix Bug #67530 error_log=syslog ignoredRemi Collet2014-07-081-0/+4
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-07-082-4/+46
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Adam Harvey2014-07-072-4/+46
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-07-072-4/+46
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-07-072-4/+46
| | | |\ \ | | | | |/
| | | | * Fixed bug #66830 (Empty header causes PHP built-in web server to hang).Adam Harvey2014-07-072-4/+46
* | | | | Merge branch 'master' into testDmitry Stogov2014-07-072-11/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Bob Weinand2014-07-062-11/+13
| |\ \ \ \ | | |/ / /
| | * | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-07-062-11/+13
* | | | | Merge branch 'master' into testDmitry Stogov2014-07-0115-533/+746
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-06-301-4/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-06-301-4/+0
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-06-301-4/+0
| | | |\ \ | | | | |/
| | | | * Revert "Fix Bug #67530 error_log=syslog ignored"Ferenc Kovacs2014-06-301-4/+0
| * | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-06-301-24/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'pull-request/694' into PHP-5.6Ferenc Kovacs2014-06-301-24/+1
| | |\ \ \
| | | * | | Fix SetHandler proxy:fcgi:// incompatibilitiesDavid Zülke2014-06-121-24/+1
| * | | | | Merge branch 'PHP-5.6'Bob Weinand2014-06-296-503/+662
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-06-296-503/+662
| * | | | | Merge branch 'PHP-5.6'Remi Collet2014-06-272-0/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-272-0/+7
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-272-0/+7
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Fix Bug #67531 syslog cannot be set in pool configurationRemi Collet2014-06-271-0/+3
| | | | * | Fix Bug #67530 error_log=syslog ignoredRemi Collet2014-06-271-0/+4
| * | | | | Merge branch 'PHP-5.6'Bob Weinand2014-06-252-0/+62
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge sapi/phpdbg into PHP-5.6Bob Weinand2014-06-252-0/+62
| | * | | | Better fix for phpdbg + libeditRemi Collet2014-06-232-2/+5
| | * | | | Fix https://github.com/krakjoe/phpdbg/issues/91Remi Collet2014-06-235-6/+15
| * | | | | Merge branch 'PHP-5.6'Remi Collet2014-06-235-6/+18
| |\ \ \ \ \
| | * | | | | Better fix for phpdbg + libeditRemi Collet2014-06-232-2/+5
| | * | | | | Fix https://github.com/krakjoe/phpdbg/issues/91Remi Collet2014-06-235-6/+15
| | |/ / / /
* | | | | | Refactored parameter passing mechanism.Dmitry Stogov2014-06-302-1/+3
* | | | | | Merge branch 'master' into phpngDmitry Stogov2014-06-1812-21/+108
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update copyright year to 2014Lior Kaplan2014-06-181-1/+1
| * | | | | Merge branch 'PHP-5.6'Lior Kaplan2014-06-181-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Update copyright year to 2014Lior Kaplan2014-06-181-1/+1
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-06-181-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-06-181-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | Update copyright year to 2014Lior Kaplan2014-06-171-1/+1