Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | Update LiteSpeed SAPI code to V6.4 | George Wang | 2014-07-10 | 4 | -1172/+2755 | |
| | | * | | Fixed typo in Makefile.frag | George Wang | 2014-07-10 | 1 | -1/+1 | |
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-07-08 | 1 | -0/+4 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Fix Bug #67530 error_log=syslog ignored | Remi Collet | 2014-07-08 | 1 | -0/+4 | |
| | * | | | update year & copyright | George Wang | 2014-07-10 | 4 | -15/+60 | |
| * | | | | cleanup file headers. | George Wang | 2014-07-10 | 2 | -16/+0 | |
| * | | | | Do not kill children process in pre-fork mode when parent process quit. | George Wang | 2014-07-10 | 1 | -2/+2 | |
| * | | | | update year & copyright | George Wang | 2014-07-10 | 4 | -15/+60 | |
* | | | | | Merge branch 'master' into phpng | Xinchen Hui | 2014-07-09 | 1 | -0/+4 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-07-08 | 1 | -0/+4 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | 5.6 have fpm_globals.force_stderr | Remi Collet | 2014-07-08 | 1 | -1/+1 | |
| | * | | | Fix Bug #67530 error_log=syslog ignored | Remi Collet | 2014-07-08 | 1 | -0/+4 | |
* | | | | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-07-08 | 2 | -4/+46 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'PHP-5.6' | Adam Harvey | 2014-07-07 | 2 | -4/+46 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2014-07-07 | 2 | -4/+46 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-07-07 | 2 | -4/+46 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Fixed bug #66830 (Empty header causes PHP built-in web server to hang). | Adam Harvey | 2014-07-07 | 2 | -4/+46 | |
* | | | | | Merge branch 'master' into test | Dmitry Stogov | 2014-07-07 | 2 | -11/+13 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'PHP-5.6' | Bob Weinand | 2014-07-06 | 2 | -11/+13 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-07-06 | 2 | -11/+13 | |
* | | | | | Merge branch 'master' into test | Dmitry Stogov | 2014-07-01 | 15 | -533/+746 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'PHP-5.6' | Ferenc Kovacs | 2014-06-30 | 1 | -4/+0 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2014-06-30 | 1 | -4/+0 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2014-06-30 | 1 | -4/+0 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Revert "Fix Bug #67530 error_log=syslog ignored" | Ferenc Kovacs | 2014-06-30 | 1 | -4/+0 | |
| * | | | | Merge branch 'PHP-5.6' | Ferenc Kovacs | 2014-06-30 | 1 | -24/+1 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge branch 'pull-request/694' into PHP-5.6 | Ferenc Kovacs | 2014-06-30 | 1 | -24/+1 | |
| | |\ \ \ | ||||||
| | | * | | | Fix SetHandler proxy:fcgi:// incompatibilities | David Zülke | 2014-06-12 | 1 | -24/+1 | |
| * | | | | | Merge branch 'PHP-5.6' | Bob Weinand | 2014-06-29 | 6 | -503/+662 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-06-29 | 6 | -503/+662 | |
| * | | | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-06-27 | 2 | -0/+7 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-27 | 2 | -0/+7 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | | * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-27 | 2 | -0/+7 | |
| | | |\ \ \ | | | | | |/ | | | | |/| | ||||||
| | | | * | | Fix Bug #67531 syslog cannot be set in pool configuration | Remi Collet | 2014-06-27 | 1 | -0/+3 | |
| | | | * | | Fix Bug #67530 error_log=syslog ignored | Remi Collet | 2014-06-27 | 1 | -0/+4 | |
| * | | | | | Merge branch 'PHP-5.6' | Bob Weinand | 2014-06-25 | 2 | -0/+62 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge sapi/phpdbg into PHP-5.6 | Bob Weinand | 2014-06-25 | 2 | -0/+62 | |
| | * | | | | Better fix for phpdbg + libedit | Remi Collet | 2014-06-23 | 2 | -2/+5 | |
| | * | | | | Fix https://github.com/krakjoe/phpdbg/issues/91 | Remi Collet | 2014-06-23 | 5 | -6/+15 | |
| * | | | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-06-23 | 5 | -6/+18 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Better fix for phpdbg + libedit | Remi Collet | 2014-06-23 | 2 | -2/+5 | |
| | * | | | | | Fix https://github.com/krakjoe/phpdbg/issues/91 | Remi Collet | 2014-06-23 | 5 | -6/+15 | |
| | |/ / / / | ||||||
* | | | | | | Refactored parameter passing mechanism. | Dmitry Stogov | 2014-06-30 | 2 | -1/+3 | |
* | | | | | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-06-18 | 12 | -21/+108 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Update copyright year to 2014 | Lior Kaplan | 2014-06-18 | 1 | -1/+1 | |
| * | | | | | Merge branch 'PHP-5.6' | Lior Kaplan | 2014-06-18 | 1 | -2/+2 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Update copyright year to 2014 | Lior Kaplan | 2014-06-18 | 1 | -1/+1 | |
| | * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Lior Kaplan | 2014-06-18 | 1 | -1/+1 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Lior Kaplan | 2014-06-18 | 1 | -1/+1 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | Update copyright year to 2014 | Lior Kaplan | 2014-06-17 | 1 | -1/+1 |