summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into phpngDmitry Stogov2014-08-141-0/+28
|\
| * Merge branch 'PHP-5.6'Ferenc Kovacs2014-08-121-0/+28
| |\
| | * restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes b...David Zuelke2014-08-091-3/+8
| | * Revert "Merge branch 'pull-request/694' into PHP-5.6"David Zuelke2014-08-091-1/+24
* | | cleanupDmitry Stogov2014-08-131-8/+5
* | | cleanup (we don't have to duplicate elements of module_registry)Dmitry Stogov2014-08-131-1/+0
* | | cleanup (use zend_string* instead of char*)Dmitry Stogov2014-08-131-11/+13
* | | Merge branch 'master' into phpngDmitry Stogov2014-08-043-6/+10
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6'Michael Wallner2014-07-303-6/+10
| |\ \ | | |/
| | * Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-07-303-6/+10
| | |\
| | | * Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-07-303-6/+10
| | | |\
| | | | * Fixed bug #67715 (php-milter does not build and crashes randomly).Michael Wallner2014-07-303-6/+10
| | | | * Fixed a bug that cannot access custom request header stored in apache_request...George Wang2014-07-111-0/+1
| | | | * 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 to LSAPI 6.6George Wang2014-07-102-10/+36
| | | | * Update LiteSpeed SAPI code to V6.4George Wang2014-07-104-669/+2007
| | | | * Fixed typo in Makefile.fragGeorge Wang2014-07-101-1/+1
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-07-251-2/+29
| | |\ \ \ | | | |/ /
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-07-221-2/+29
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-07-201-2/+14
| |\ \ \ \
| | * \ \ \ Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-07-201-2/+14
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | See bug #67635Remi Collet2014-07-201-2/+14
| * | | | | Merge branch 'PHP-5.6'Remi Collet2014-07-191-3/+18
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-07-191-3/+18
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | improve previous, add message during configureRemi Collet2014-07-191-0/+3
| | | * | Fixed bug #67635 php links to systemd libraries without using pkg-configRemi Collet2014-07-191-3/+15
| | | * | This test depends on expose_php being onRasmus Lerdorf2014-07-141-0/+2
| | * | | This test depends on expose_php being onRasmus Lerdorf2014-07-141-0/+2
* | | | | Merge remote-tracking branch 'origin/master' into phpngXinchen Hui2014-07-181-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | This test depends on expose_php being onRasmus Lerdorf2014-07-141-0/+2
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-07-145-37/+70
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6'Tjerk Meesters2014-07-121-4/+8
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-07-121-4/+8
| | |\ \ \ | | | |/ /
| | | * | Fix #67594 - invisible colon should be stripped off header nameTjerk Meesters2014-07-121-4/+8
| | | * | Fixed a bug that cannot access custom request header stored in apache_request...George Wang2014-07-111-0/+1
| | * | | fixed broken merged codeGeorge Wang2014-07-112-191/+0
| | * | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6George Wang2014-07-112-0/+191
| | |\ \ \
| | | * \ \ Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Anatol Belski2014-07-101-0/+1
| | | |\ \ \
| | * | | | | Fixed a bug that cannot access custom request header stored in apache_request...George Wang2014-07-111-0/+1
| | | |/ / / | | |/| | |
| | * | | | 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 to LSAPI 6.6George Wang2014-07-102-10/+36
| * | | | | fixed broken merged codeGeorge Wang2014-07-111-184/+0
| * | | | | Fixed a bug that cannot access custom request header stored in apache_request...George Wang2014-07-111-0/+1
| * | | | | Merge branch 'PHP-5.6'Anatol Belski2014-07-101-0/+184
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-07-103-21/+221
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | 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 to LSAPI 6.6George Wang2014-07-102-10/+36
View Lorry Controller Status