com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/openssl/openssl.c ext/openssl/x
p_ssl.c
| From: | Anatol Belski | Date: | Wed, 26 Feb 2014 16:16:20 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/openssl/openssl.c ext/openssl/x p_ssl.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76234@lists.php.net to get a copy of this message | ||
Commit: 758f73630a65cd99773f97e8b098403677b6e03f
Author: Anatol Belski <ab@php.net> Wed, 26 Feb 2014 17:16:20 +0100
Parents: 4d1ab57e4ffd1a8efcbac377af30d434b42d6447 d753db3a817abda43d4fcae19e8ae4aa38050f8b
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=758f73630a65cd99773f97e8b098403677b6e03f
Log:
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into
str_size_and_int64
* origin/str_size_and_int64_56_backport: (23 commits)
after merge fix
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
kick redundant include
Prevent implicit function declaration when TLSEXT unavailable
Update NEWS+UPGRADING (openssl)
Remove test case invalidated by openssl.cafile accessibility change
Tolerate non-standard newlines when parsing stream CA files
Remove openssl tests that shouldn't have survived last merge
Add openssl.cafile ini check when loading cainfo
Change openssl directives to PHP_INI_PERDIR
Update openssl tests with new server/client test harness
Add peer certificate verification on windows
add news entry
add news entry
add clear_env option to FPM config
...
Changed paths:
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
Diff: