summaryrefslogtreecommitdiff
path: root/sapi/fpm
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-184-4/+95
|\ \ \ | |/ /
| * | Add test for bug #68442Remi Collet2014-11-184-4/+95
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-1811-7/+1082
|\ \ \ | |/ /
| * | Add various tests for FPMRemi Collet2014-11-189-6/+467
| * | Include small MIT FastCGI client library fromRemi Collet2014-11-182-1/+615
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-173-4/+68
|\ \ \ | |/ /
| * | Add new FPM test for IPv4/IPv6Remi Collet2014-11-173-4/+68
| * | update fpm configuration for #68428Remi Collet2014-11-171-1/+1
* | | update fpm configuration for #68428Remi Collet2014-11-171-1/+1
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-171-22/+50
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-171-22/+50
| |\ \ | | |/
| | * Fixed bug #68428 allowed_client is IPv4 onlyRemi Collet2014-11-171-22/+50
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-172-6/+16
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-172-6/+16
| |\ \ | | |/
| | * comment about ipv4-mapped in fpm confRemi Collet2014-11-171-2/+2
| | * Improve fix bug #68421 access.format='%R' doesn't log ipv6 addressRemi Collet2014-11-171-4/+14
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-161-2/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-161-2/+4
| |\ \ | | |/
| | * improve comments about FPM listen optionRemi Collet2014-11-161-2/+4
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-151-7/+17
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-151-7/+17
| |\ \ | | |/
| | * Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addressesRemi Collet2014-11-151-7/+17
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-143-4/+10
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-143-4/+10
| |\ \ | | |/
| | * Fix bug #68421 access.format='%R' doesn't log ipv6 addressRemi Collet2014-11-143-4/+10
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-141-3/+14
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-141-3/+14
| |\ \ | | |/
| | * Fix bug #68423i PHP-FPM will no longer load all poolsRemi Collet2014-11-141-3/+14
* | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-10-034-48/+98
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-10-034-48/+98
| |\ \ | | |/
| | * add IPv6 support to php-fpmRobin Gloster2014-10-034-48/+98
* | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-2016-22/+32
|\ \ \
| * | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-1915-15/+15
| * | | Fixed useless or duplicated IS_INTERNED() checksDmitry Stogov2014-09-191-1/+1
| * | | Merge branch 'PHP-5.6'Remi Collet2014-09-151-0/+11
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-09-151-0/+11
| | |\ \ | | | |/
| | | * Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when us...Remi Collet2014-09-151-0/+11
| | | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-281-3/+8
| | | |\
| | | | * restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes b...David Zuelke2014-08-281-3/+8
| * | | | Refactored INI subsystem to use zend_string* instead of char*Dmitry Stogov2014-09-011-6/+5
* | | | | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-201-1/+1
|/ / / /
* | | | Fixed incompatible pointer type (int64)Xinchen Hui2014-08-261-4/+4
* | | | Remove ZEND_ACC_INTERACTIVE and CG(interactive)Nikita Popov2014-08-251-1/+0
* | | | master renames phase 1Anatol Belski2014-08-252-6/+6
* | | | Merge remote-tracking branch 'php/master'Anatol Belski2014-08-201-6/+25
|\ \ \ \
| * | | | Fixed off-by-one memory allocation that could lead to invalid memory reads on...Tjerk Meesters2014-08-201-5/+4
| * | | | Merge branch 'fpmConfFix' of github.com:DaveRandom/php-srcAndrea Faulds2014-08-201-5/+25
| |\ \ \ \
| | * | | | Allow unlimited line length in fpm config filesChris Wright2013-10-281-5/+25
* | | | | | basic macro replacements, all at onceAnatol Belski2014-08-191-1/+1
|/ / / / /
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-08-141-0/+28
|\ \ \ \ \