summaryrefslogtreecommitdiff
Commit message (Collapse)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
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (136 commits) fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627 add missing NEWS entry add missing NEWS entry add missing NEWS entry add missing NEWS entry add missing NEWS entry add missing NEWS entry Deprecate CN_match in favor of peer_name in SSL contexts Remove cURL close policy related constants Update stack size in tests/func/010.phpt Don't add num_additional_args in SEND opcodes Disallow use of positional args after unpacking Store arg_num in fcall entry Introduce zend_function_call_entry structure move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged rearrange the NEWS blocks a bit add NEWS block for 5.6.0 beta1 restored that test part in ext/openssl to enable notify/wait remove echo fix stdin reading in new openssl tests ...
| * Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-02-273-3/+3
| |\ | | | | | | | | | | | | * PHP-5.5: fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
| | * Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-02-273-3/+3
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
| | | * fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627Ferenc Kovacs2014-02-273-3/+3
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-02-270-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: add missing NEWS entry
| | * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP-5.6 * 'curlClosePolicy' of https://github.com/DaveRandom/php-src: Remove cURL close policy related constants
| | * | | Remove cURL close policy related constantsChris Wright2014-02-261-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These options don't do anything and they never have. Refs: http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTCLOSEPOLICY http://curl.haxx.se/mail/lib-2006-11/0301.html
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Stack size is 16K nowadays. Now the test takes a more reasonable amount of time to run...
| * | | Don't add num_additional_args in SEND opcodesNikita Popov2014-02-263-34/+19
| | | | | | | | | | | | | | | | | | | | | | | | Now that trailing positional args are disallowed, num_additional_args will always be zero in SEND opcodes (and FUNC_ARG fetches).
| * | | Disallow use of positional args after unpackingNikita Popov2014-02-2611-105/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit disallows the use of trailing positional arguments after argument unpacking was used. The following calls are no longer valid: fn(...$array, $var); fn(...$array1, $var, ...$array2); However, all of the following continue to be valid: fn($var, ...$array); fn(...$array1, ...$array2); fn($var, ...$array1, ...$array2); The reason behind this change is a stack allocation issue pointed out by Dmitry: As of PHP 5.5 the stack necessary for pushing arguments is precomputed and preallocated, as such the individual SEND opcodes no longer verify that there is enough stack space. The unpacked arguments will occupy some of that preallocated space and as such following positional arguments could write past a stack page boundary. An alternative resolution for this issue is to ensure that there is enough space for the remaining arguments in the UNPACK opcode. However making this allocation precise (rather than using a conversative over-estimate) would require some effort. Given that this particular aspect of the feature wasn't very popular in the first place, it doesn't seem worth the effort.
| * | | Store arg_num in fcall entryNikita Popov2014-02-263-43/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of storing the argument number in the znode of the parameter list, store it in fcall->arg_num. This mainly cleans up the parameter parsing code, which previously had to duplicate all rules (this becomes more excessive as more features are added, e.g. named params would already require a minimum of 14 rules...)
| * | | Introduce zend_function_call_entry structureNikita Popov2014-02-262-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | Instead of directly pushing the zend_function* onto the function_call_stack, push this structure. This allows us to store additional data on this stack.
| * | | move the default encoding NEWS entry to alpha3, as it was pushed after beta2 ↵Ferenc Kovacs2014-02-261-2/+2
| | | | | | | | | | | | | | | | was tagged
| * | | 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
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: add news entry add news entry add clear_env option to FPM config add clear_env option to FPM config Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+ Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
| | * | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-02-260-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | * PHP-5.4: add news entry add clear_env option to FPM config
| | | * add news entryAntony Dovgal2014-02-251-0/+4
| | | |
| | | * add clear_env option to FPM configPaul Annesley2014-02-254-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to leave the envoronment as is on startup and pass all the variables to the workers. The default value of clear_env is "yes", preserving previous behaviour. Patch by Paul Annesley.
| | * | add news entryAntony Dovgal2014-02-251-0/+4
| | | |
| | * | add clear_env option to FPM configPaul Annesley2014-02-254-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to leave the envoronment as is on startup and pass all the variables to the workers. The default value of clear_env is "yes", preserving previous behaviour. Patch by Paul Annesley.
| | * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2014-02-241-1/+13
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
| | | * Reduce test noise on cross Oracle client <-> server version tests.Christopher Jones2014-02-241-1/+13
| | | | | | | | | | | | | | | | This fix is already in PHP 5.6+
| | * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2014-02-241-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
| | | * Reduce test noise in cross Oracle client <-> server version testing.Christopher Jones2014-02-241-1/+1
| | | | | | | | | | | | | | | | This change is already in PHP 5.6+
| * | | 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
| | | | | | | | | | | | | | | | this is already present from php.h
| * | | 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 ↵Daniel Lowrey2014-02-2527-960/+1162
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/DaveRandom/php-src into PHP-5.6 * 'windowsPeerVerification' of https://github.com/DaveRandom/php-src: Update openssl tests with new server/client test harness Add peer certificate verification on windows
| | * | | 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
| | | | | | | | | | | | | | | | | | | | Peer certificate verification on Windows using the native certificate store and the Windows API
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are .phpt files I meant to remove with the last batch as the same functionality is now covered in other tests and these are no longer needed.
| * | | | 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
| |/ / / | | | | | | | | | | | | | | | | | | | | Because openssl.cafile and openssl.capath have implications for security these directives have been changed to PHP_INI_PERDIR (previously PHP_INI_ALL)
| * | | 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
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: fixed macro
| | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-02-241-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.4: fixed macro