Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-11-18 | 4 | -4/+95 | |
|\ \ \ | |/ / | ||||||
| * | | Add test for bug #68442 | Remi Collet | 2014-11-18 | 4 | -4/+95 | |
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-11-18 | 11 | -7/+1082 | |
|\ \ \ | |/ / | ||||||
| * | | Add various tests for FPM | Remi Collet | 2014-11-18 | 9 | -6/+467 | |
| * | | Include small MIT FastCGI client library from | Remi Collet | 2014-11-18 | 2 | -1/+615 | |
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-11-17 | 3 | -4/+68 | |
|\ \ \ | |/ / | ||||||
| * | | Add new FPM test for IPv4/IPv6 | Remi Collet | 2014-11-17 | 3 | -4/+68 | |
| * | | update fpm configuration for #68428 | Remi Collet | 2014-11-17 | 1 | -1/+1 | |
* | | | update fpm configuration for #68428 | Remi Collet | 2014-11-17 | 1 | -1/+1 | |
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-11-17 | 1 | -22/+50 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-11-17 | 1 | -22/+50 | |
| |\ \ | | |/ | ||||||
| | * | Fixed bug #68428 allowed_client is IPv4 only | Remi Collet | 2014-11-17 | 1 | -22/+50 | |
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-11-17 | 2 | -6/+16 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-11-17 | 2 | -6/+16 | |
| |\ \ | | |/ | ||||||
| | * | comment about ipv4-mapped in fpm conf | Remi Collet | 2014-11-17 | 1 | -2/+2 | |
| | * | Improve fix bug #68421 access.format='%R' doesn't log ipv6 address | Remi Collet | 2014-11-17 | 1 | -4/+14 | |
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-11-16 | 1 | -2/+4 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-11-16 | 1 | -2/+4 | |
| |\ \ | | |/ | ||||||
| | * | improve comments about FPM listen option | Remi Collet | 2014-11-16 | 1 | -2/+4 | |
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-11-15 | 1 | -7/+17 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-11-15 | 1 | -7/+17 | |
| |\ \ | | |/ | ||||||
| | * | Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses | Remi Collet | 2014-11-15 | 1 | -7/+17 | |
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-11-14 | 3 | -4/+10 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-11-14 | 3 | -4/+10 | |
| |\ \ | | |/ | ||||||
| | * | Fix bug #68421 access.format='%R' doesn't log ipv6 address | Remi Collet | 2014-11-14 | 3 | -4/+10 | |
* | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-11-14 | 1 | -3/+14 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-11-14 | 1 | -3/+14 | |
| |\ \ | | |/ | ||||||
| | * | Fix bug #68423i PHP-FPM will no longer load all pools | Remi Collet | 2014-11-14 | 1 | -3/+14 | |
* | | | Merge branch 'PHP-5.6' | Ferenc Kovacs | 2014-10-03 | 4 | -48/+98 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2014-10-03 | 4 | -48/+98 | |
| |\ \ | | |/ | ||||||
| | * | add IPv6 support to php-fpm | Robin Gloster | 2014-10-03 | 4 | -48/+98 | |
* | | | Merge branch 'master' into issue-67910 | Florian MARGAINE | 2014-09-20 | 16 | -22/+32 | |
|\ \ \ | ||||||
| * | | | s/PHP 5/PHP 7/ | Johannes Schlüter | 2014-09-19 | 15 | -15/+15 | |
| * | | | Fixed useless or duplicated IS_INTERNED() checks | Dmitry Stogov | 2014-09-19 | 1 | -1/+1 | |
| * | | | Merge branch 'PHP-5.6' | Remi Collet | 2014-09-15 | 1 | -0/+11 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-09-15 | 1 | -0/+11 | |
| | |\ \ | | | |/ | ||||||
| | | * | Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when us... | Remi Collet | 2014-09-15 | 1 | -0/+11 | |
| | | * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-08-28 | 1 | -3/+8 | |
| | | |\ | ||||||
| | | | * | restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes b... | David Zuelke | 2014-08-28 | 1 | -3/+8 | |
| * | | | | Refactored INI subsystem to use zend_string* instead of char* | Dmitry Stogov | 2014-09-01 | 1 | -6/+5 | |
* | | | | | Replaces php5 with php7, without whitespace changes. | Florian MARGAINE | 2014-09-20 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Fixed incompatible pointer type (int64) | Xinchen Hui | 2014-08-26 | 1 | -4/+4 | |
* | | | | Remove ZEND_ACC_INTERACTIVE and CG(interactive) | Nikita Popov | 2014-08-25 | 1 | -1/+0 | |
* | | | | master renames phase 1 | Anatol Belski | 2014-08-25 | 2 | -6/+6 | |
* | | | | Merge remote-tracking branch 'php/master' | Anatol Belski | 2014-08-20 | 1 | -6/+25 | |
|\ \ \ \ | ||||||
| * | | | | Fixed off-by-one memory allocation that could lead to invalid memory reads on... | Tjerk Meesters | 2014-08-20 | 1 | -5/+4 | |
| * | | | | Merge branch 'fpmConfFix' of github.com:DaveRandom/php-src | Andrea Faulds | 2014-08-20 | 1 | -5/+25 | |
| |\ \ \ \ | ||||||
| | * | | | | Allow unlimited line length in fpm config files | Chris Wright | 2013-10-28 | 1 | -5/+25 | |
* | | | | | | basic macro replacements, all at once | Anatol Belski | 2014-08-19 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-08-14 | 1 | -0/+28 | |
|\ \ \ \ \ |