summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-2388-200/+200
* Merge remote-tracking branch 'origin/PHP-5.6'Bob Weinand2014-11-234-25/+57
|\
| * Fix bug #68446 (bug with constant defaults and type hints)Bob Weinand2014-11-235-47/+80
* | Add NEWS & UPGRADINGStanislav Malyshev2014-11-222-1/+8
* | secured unserializeStanislav Malyshev2014-11-226-49/+237
* | Merge branch 'PHP-5.6'Remi Collet2014-11-220-0/+0
|\ \ | |/
| * typoRemi Collet2014-11-221-1/+1
| * Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-220-0/+0
| |\
| | * NEWSRemi Collet2014-11-221-0/+1
| | * Fixed Bug #68478 acess_log don't use prefixRemi Collet2014-11-223-3/+6
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-226-4/+163
|\ \ \ | |/ /
| * | NEWSRemi Collet2014-11-221-1/+2
| * | minor typo in testRemi Collet2014-11-221-1/+1
| * | add test for global / pool prefix and bug #68478Remi Collet2014-11-222-0/+156
| * | Fixed Bug #68478 acess_log don't use prefixRemi Collet2014-11-223-3/+6
* | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-11-220-0/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-220-0/+0
| |\ \ | | |/
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-11-220-0/+0
| | |\
| | | * Revert "made lsapi_main.c compatible with PHP7/phpng ."Stanislav Malyshev2014-11-221-92/+26
| | * | Updated NEWSJulien Pauli2014-11-211-0/+1
| * | | Updated NEWSJulien Pauli2014-11-211-0/+1
* | | | Updated NEWSJulien Pauli2014-11-211-0/+1
* | | | Fix #68185 - Inconsistent insteadof definitionJulien Pauli2014-11-211-1/+1
* | | | Merge branch 'PHP-5.6'Julien Pauli2014-11-210-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-11-211-2/+2
| |\ \ \ | | |/ /
| | * | Fix #68185 - Inconsistent insteadof definitionJulien Pauli2014-11-211-1/+1
* | | | Merge branch 'PHP-5.6'Anatol Belski2014-11-211-0/+8
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-11-211-0/+8
| |\ \ \ | | |/ /
| | * | fixed testAnatol Belski2014-11-211-0/+8
* | | | Merge branch 'PHP-5.6'Remi Collet2014-11-211-0/+67
|\ \ \ \ | |/ / /
| * | | add test for fastcgi_finish_request()Remi Collet2014-11-211-0/+67
* | | | Merge branch 'PHP-5.6'Anatol Belski2014-11-2110-7/+144
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-11-2110-7/+144
| |\ \ \ | | |/ /
| | * | added test for things done so far for bug #66265Anatol Belski2014-11-217-0/+98
| | * | partially fixed bug #66265Anatol Belski2014-11-211-7/+11
| | * | forked bug67052.phpt for WindowsAnatol Belski2014-11-212-0/+35
* | | | Merge branch 'PHP-5.6'Remi Collet2014-11-210-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-210-0/+0
| |\ \ \ | | |/ /
| | * | NEWSRemi Collet2014-11-211-0/+2
| | * | Fix bug #68463 listen.allowed_clients can silently result in no allowed accessRemi Collet2014-11-211-0/+4
| | * | Raise a warning when listen = hostname used and is resolved as multiple addre...Remi Collet2014-11-211-4/+9
* | | | Merge branch 'PHP-5.6'Remi Collet2014-11-210-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-210-0/+0
| |\ \ \ | | |/ /
| | * | NEWSRemi Collet2014-11-211-0/+2
| | * | move zlog_set_level() againDavid Zuelke2014-11-212-2/+1
| | * | Change pm.start_servers default warning to noticeDavid Zuelke2014-11-211-1/+1
* | | | Merge branch 'PHP-5.6'Remi Collet2014-11-212-1/+88
|\ \ \ \ | |/ / /
| * | | add test for #68391Remi Collet2014-11-211-0/+87
| * | | NEWSRemi Collet2014-11-211-1/+3
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-211-1/+1
| |\ \ \ | | |/ /