Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug (#69195 Inconsistent stream crypto values across versions)

Conflicts:
	ext/standard/http_fopen_wrapper.c

diff --cc ext/standard/http_fopen_wrapper.c
index 1f54f62c6c3fab4af926f50dc007704b245501b2,eb371c43084c7999b155c8579a76bfca80670c08..457e80644075f82388bec16aea8e6b34cfa16800
--- 1/ext/standard/http_fopen_wrapper.c
--- 2/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@@ -331,9 -323,9 +331,9 @@@ finish
  
                /* enable SSL transport layer */
                if (stream) {
-                       if (php_stream_xport_crypto_setup(stream, STREAM_CRYPTO_METHOD_ANY_CLIENT, NULL) < 0 ||
 -                      if (php_stream_xport_crypto_setup(stream, STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 ||
 -                          php_stream_xport_crypto_enable(stream, 1 TSRMLS_CC) < 0) {
 -                              php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Cannot connect to HTTPS server through proxy");
++                      if (php_stream_xport_crypto_setup(stream, STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL) < 0 ||
 +                          php_stream_xport_crypto_enable(stream, 1) < 0) {
 +                              php_stream_wrapper_log_error(wrapper, options, "Cannot connect to HTTPS server through proxy");
                                php_stream_close(stream);
                                stream = NULL;
                        }

diff --cc main/streams/php_stream_transport.h
Simple merge