summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 5.6.0alpha3php-5.6.0alpha3Ferenc Kovacs2014-02-272-3/+3
* Merge branch 'PHP-5.6' into PHP-5.6.0Ferenc Kovacs2014-02-27183-28735/+45430
|\
| * Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-02-273-3/+3
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-02-273-3/+3
| | |\
| | | * fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627Ferenc Kovacs2014-02-273-3/+3
| * | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-02-270-0/+0
| |\ \ \ | | |/ /
| | * | add missing NEWS entryFerenc Kovacs2014-02-271-0/+3
| * | | add missing NEWS entryFerenc Kovacs2014-02-271-0/+4
| * | | add missing NEWS entryFerenc Kovacs2014-02-271-0/+1
| * | | add missing NEWS entryFerenc Kovacs2014-02-271-0/+3
| * | | add missing NEWS entryFerenc Kovacs2014-02-271-1/+2
| * | | add missing NEWS entryFerenc Kovacs2014-02-271-0/+1
| * | | Merge branch 'curlClosePolicy' of https://github.com/DaveRandom/php-src into ...Daniel Lowrey2014-02-262-9/+2
| |\ \ \
| | * | | Remove cURL close policy related constantsChris Wright2014-02-261-9/+0
| * | | | Deprecate CN_match in favor of peer_name in SSL contextsDaniel Lowrey2014-02-2625-44/+71
| |/ / /
| * | | Update stack size in tests/func/010.phptNikita Popov2014-02-261-1/+1
| * | | Don't add num_additional_args in SEND opcodesNikita Popov2014-02-263-34/+19
| * | | Disallow use of positional args after unpackingNikita Popov2014-02-2611-105/+94
| * | | Store arg_num in fcall entryNikita Popov2014-02-263-43/+45
| * | | Introduce zend_function_call_entry structureNikita Popov2014-02-262-20/+27
| * | | move the default encoding NEWS entry to alpha3, as it was pushed after beta2 ...Ferenc Kovacs2014-02-261-2/+2
| * | | rearrange the NEWS blocks a bitFerenc Kovacs2014-02-261-6/+6
| * | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-02-260-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-02-260-0/+0
| | |\ \ | | | |/
| | | * add news entryAntony Dovgal2014-02-251-0/+4
| | | * add clear_env option to FPM configPaul Annesley2014-02-254-1/+16
| | * | add news entryAntony Dovgal2014-02-251-0/+4
| | * | add clear_env option to FPM configPaul Annesley2014-02-254-1/+16
| | * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2014-02-241-1/+13
| | |\ \ | | | |/
| | | * Reduce test noise on cross Oracle client <-> server version tests.Christopher Jones2014-02-241-1/+13
| | * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2014-02-241-1/+1
| | |\ \ | | | |/
| | | * Reduce test noise in cross Oracle client <-> server version testing.Christopher Jones2014-02-241-1/+1
| * | | add NEWS block for 5.6.0 beta1Ferenc Kovacs2014-02-261-1/+4
| * | | restored that test part in ext/openssl to enable notify/waitAnatol Belski2014-02-261-3/+4
| * | | remove echoAnatol Belski2014-02-261-2/+0
| * | | fix stdin reading in new openssl testsAnatol Belski2014-02-261-3/+4
| * | | kick redundant includeAnatol Belski2014-02-261-1/+0
| * | | Prevent implicit function declaration when TLSEXT unavailableDaniel Lowrey2014-02-251-0/+2
| * | | Update NEWS+UPGRADING (openssl)Daniel Lowrey2014-02-252-12/+19
| * | | Remove test case invalidated by openssl.cafile accessibility changeDaniel Lowrey2014-02-251-8/+0
| * | | Merge branch 'windowsPeerVerification' of https://github.com/DaveRandom/php-s...Daniel Lowrey2014-02-2527-960/+1162
| |\ \ \
| | * | | Update openssl tests with new server/client test harnessChris Wright2014-02-2526-953/+960
| | * | | Add peer certificate verification on windowsChris Wright2014-02-252-29/+225
| * | | | Tolerate non-standard newlines when parsing stream CA filesDaniel Lowrey2014-02-251-12/+21
| * | | | Remove openssl tests that shouldn't have survived last mergeDaniel Lowrey2014-02-252-94/+0
| * | | | Add openssl.cafile ini check when loading cainfoDaniel Lowrey2014-02-251-1/+4
| * | | | Change openssl directives to PHP_INI_PERDIRDaniel Lowrey2014-02-251-2/+2
| |/ / /
| * | | Use API instead of directly acessing the structureAndrey Hristov2014-02-251-2/+4
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-02-241-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-02-241-1/+1
| | |\ \ | | | |/