Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ | |||||
| * | | fix limitation of upload size == (U)INT_MAX in CGI | Michael Wallner | 2013-10-28 | 1 | -1/+4 |
* | | | Merge branch 'PHP-5.5' | Antony Dovgal | 2013-10-27 | 2 | -3/+3 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | increase backlog to the highest value everywhere | Antony Dovgal | 2013-10-27 | 2 | -3/+3 |
* | | Merge branch 'master' of https://github.com/guggemand/php-src | Michael Wallner | 2013-10-21 | 2 | -2/+8 |
|\ \ | |||||
| * | | Dont reset other counters when incrementing slow_rq | Karsten Schmidt | 2013-02-20 | 2 | -2/+8 |
* | | | Merge branch 'master' of https://github.com/DylanArnold/php-src | Michael Wallner | 2013-10-21 | 1 | -1/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Call php_module_shutdown() for php-fpm child processes | Dylan Arnold | 2013-09-09 | 1 | -1/+2 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Rasmus Lerdorf | 2013-10-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix typo | Rasmus Lerdorf | 2013-10-20 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Rasmus Lerdorf | 2013-10-19 | 3 | -4/+5 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | Initialize these to make Coverity happy | Rasmus Lerdorf | 2013-10-19 | 1 | -2/+3 |
| * | | Typo fix: managment -> management | Lior Kaplan | 2013-10-19 | 1 | -1/+1 |
| * | | Use minus sign instead of hyphen | Lior Kaplan | 2013-10-19 | 1 | -1/+1 |
* | | | Fix long-standing visual pain point: the misalignment of './configure help' t... | Christopher Jones | 2013-08-06 | 1 | -4/+4 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-04 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | non living code related typo fixes | Veres Lajos | 2013-08-04 | 1 | -1/+1 |
| * | | typo fixes | Veres Lajos | 2013-07-15 | 1 | -1/+1 |
* | | | HASH_KEY_NON_EXISTANT fix | Veres Lajos | 2013-07-21 | 1 | -1/+1 |
* | | | typo fixes | Veres Lajos | 2013-07-15 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Felipe Pena | 2013-06-26 | 1 | -0/+13 |
|\ \ \ | |/ / | |||||
| * | | - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuk... | Felipe Pena | 2013-06-26 | 1 | -0/+13 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-06-16 | 1 | -1/+15 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #64764: Add status option to fpm init.d script | Lior Kaplan | 2013-06-16 | 1 | -1/+15 |
| * | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -1/+1 |
* | | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-06-10 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | typo fixes (argument) | 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 |