Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 7 | -7/+7 |
* | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-06-10 | 2 | -2/+2 |
|\ | |||||
| * | typo fixes (argument) | Veres Lajos | 2013-06-10 | 1 | -1/+1 |
| * | typo fixes (accommodate, parameter) | Veres Lajos | 2013-06-10 | 1 | -1/+1 |
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-05-24 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | Fixed Bug #64915 (error_log ignored when daemonize=0) | Remi Collet | 2013-05-24 | 1 | -0/+4 |
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-05-21 | 8 | -2/+189 |
|\ \ | |/ | |||||
| * | Add --with-fpm-systemd option to report health to systemd, and | Remi Collet | 2013-05-21 | 8 | -2/+189 |
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-05-03 | 4 | -4/+12 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Remi Collet | 2013-05-03 | 4 | -4/+12 |
| |\ | |||||
| | * | From code coverity scan, syscall return value must be check. | Remi Collet | 2013-05-03 | 4 | -4/+12 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-05-02 | 2 | -1/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Remi Collet | 2013-05-02 | 2 | -1/+6 |
| |\ \ | | |/ | |||||
| | * | fix more resource leaks | Remi Collet | 2013-05-02 | 2 | -1/+6 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-05-02 | 3 | -5/+27 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Remi Collet | 2013-05-02 | 3 | -5/+27 |
| |\ \ | | |/ | |||||
| | * | From code coverity scan | Remi Collet | 2013-05-02 | 3 | -5/+27 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-05-02 | 1 | -6/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Remi Collet | 2013-05-02 | 1 | -6/+6 |
| |\ \ | | |/ | |||||
| | * | fixed size array cannot be null | Remi Collet | 2013-05-02 | 1 | -6/+6 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-05-02 | 1 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Remi Collet | 2013-05-02 | 1 | -3/+3 |
| |\ \ | | |/ | |||||
| | * | use limit_extensions as we use security_limit_extensions later (free) | Remi Collet | 2013-05-02 | 1 | -2/+2 |
| | * | unused variable | Remi Collet | 2013-05-02 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-05-02 | 1 | -102/+106 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Remi Collet | 2013-05-02 | 1 | -102/+106 |
| |\ \ | | |/ | |||||
| | * | fix possible null deref (detected by code coverity scan) | Remi Collet | 2013-05-02 | 1 | -102/+106 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-04-30 | 1 | -1/+6 |
|\ \ \ | |/ / | |||||
| * | | When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm | Remi Collet | 2013-04-30 | 1 | -1/+6 |
| * | | Forgot to fix the test on 5.4 | Nikita Popov | 2013-03-28 | 1 | -1/+1 |
* | | | Revert "Fix conversion from unsigned char to char" | David Soria Parra | 2013-04-29 | 1 | -1/+1 |
* | | | Fix conversion from unsigned char to char | David Soria Parra | 2013-04-26 | 1 | -1/+1 |
* | | | leave a sane environment behind (even if empty) when exiting | Nuno Lopes | 2013-04-07 | 1 | -0/+4 |
* | | | missed part of the patch | Xinchen Hui | 2013-03-29 | 1 | -0/+1 |
* | | | Fixed bug #64544 (Valgrind warnings after using putenv) | Xinchen Hui | 2013-03-29 | 2 | -5/+27 |
* | | | Merge branch 'pull-request/313' into PHP-5.5 | Keyur Govande | 2013-03-29 | 2 | -5/+9 |
|\ \ \ | |||||
| * | | | Patch for Bug #64544. | Keyur Govande | 2013-03-29 | 2 | -5/+9 |
* | | | | Fix Bug #64545: PHP Error in ef93a93ee21bce9218188 | Nikita Popov | 2013-03-28 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-03-28 | 1 | -2/+7 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Attempt to fix SKIP | Xinchen Hui | 2013-03-28 | 1 | -2/+7 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-03-28 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix test on Mac (\D shows up) | Xinchen Hui | 2013-03-28 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-03-28 | 1 | -0/+62 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add test for #64529 | Xinchen Hui | 2013-03-28 | 1 | -0/+62 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Johannes Schlüter | 2013-03-24 | 1 | -3/+29 |
|\ \ \ \ | |/ / / | |||||
| * | | | Document embedded server options in manpage | Johannes Schlüter | 2013-03-24 | 1 | -1/+27 |
| * | | | Merge branch 'PHP-5.3' into PHP-5.4 | Johannes Schlüter | 2013-03-24 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | It's 2013, even for a manpage | Johannes Schlüter | 2013-03-24 | 1 | -2/+2 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Pierre Joye | 2013-03-24 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | - add reminder for checking return values | Pierre Joye | 2013-03-24 | 1 | -0/+2 |