| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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' | 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' | Stanislav Malyshev | 2014-04-29 | 2 | -3/+3 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-29 | 2 | -3/+3 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-29 | 2 | -3/+3 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Fix bug #67060: use default mode of 660 | Stanislav Malyshev | 2014-04-29 | 2 | -3/+3 |
| * | | | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2014-04-20 | 1 | -1/+5 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-20 | 1 | -1/+5 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-20 | 1 | -1/+5 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Fix #66908: php-fpm reload leaks epoll_create() file descriptor | Julio Pintos | 2014-04-20 | 1 | -1/+5 |
| * | | | | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2014-04-13 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-13 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 1 | -1/+1 |
| | | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/| | |||||
| | | | * | Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in... | itxx00 | 2014-04-13 | 1 | -1/+1 |
| | | | * | add clear_env option to FPM config | Paul Annesley | 2014-02-25 | 4 | -1/+16 |
| | | | * | Bump year | Xinchen Hui | 2014-01-03 | 15 | -17/+17 |
| | | | * | Fix bug #66008 | Rasmus Lerdorf | 2013-10-31 | 1 | -0/+1 |
| | | * | | add clear_env option to FPM config | Paul Annesley | 2014-02-25 | 4 | -1/+16 |
| | | * | | Bump year | Xinchen Hui | 2014-01-03 | 15 | -17/+17 |
| | * | | | add clear_env option to FPM config | Paul Annesley | 2014-02-24 | 4 | -1/+16 |
| * | | | | add clear_env option to FPM config | Paul Annesley | 2014-02-24 | 4 | -1/+16 |
| * | | | | Merge branch 'PHP-5.6' | Lior Kaplan | 2014-02-14 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | a few typofixes | Veres Lajos | 2014-02-14 | 1 | -2/+2 |
| | * | | | fix indentation | Antony Dovgal | 2014-01-17 | 7 | -54/+59 |
| | * | | | Add some basic and apparmor tests to fpm | Gernot Vormayr | 2014-01-17 | 6 | -0/+250 |
| | * | | | Add --force-stderr to fpm | Gernot Vormayr | 2014-01-17 | 4 | -5/+16 |
| | * | | | Add apparmor change hat functionality to fpm | Gernot Vormayr | 2014-01-17 | 4 | -0/+56 |
| * | | | | fix indentation | Antony Dovgal | 2014-01-17 | 7 | -54/+59 |
| * | | | | Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src | Antony Dovgal | 2014-01-16 | 14 | -5/+322 |
| |\ \ \ \ | |||||
| | * | | | | Add some basic and apparmor tests to fpm | Gernot Vormayr | 2014-01-07 | 6 | -0/+250 |
| | * | | | | Add --force-stderr to fpm | Gernot Vormayr | 2014-01-07 | 4 | -5/+16 |
| | * | | | | Add apparmor change hat functionality to fpm | Gernot Vormayr | 2013-07-02 | 4 | -0/+56 |
| * | | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2014-01-03 | 15 | -17/+17 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Bump year | Xinchen Hui | 2014-01-03 | 15 | -17/+17 |
| * | | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2013-12-27 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Fixed bug #66358 (fpm starts segfault) | Xinchen Hui | 2013-12-27 | 1 | -1/+1 |
| * | | | | | Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRM... | Kalle Sommer Nielsen | 2013-12-18 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'PHP-5.5' | Rasmus Lerdorf | 2013-10-31 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Fix bug #66008 | Rasmus Lerdorf | 2013-10-31 | 1 | -0/+1 |
| * | | | | Merge branch 'master' of https://git.php.net/repository/php-src | Antony Dovgal | 2013-10-28 | 1 | -1/+4 |
| |\ \ \ \ | |||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |