From: Daniel Lowrey <rdlowrey@php.net>
Date: Fri, 6 Mar 2015 04:18:09 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~792
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e0a1a71e951bfb29bd43c6341b2e72f4386377f;p=php

Merge branch 'PHP-5.6'

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

Conflicts:
	ext/standard/http_fopen_wrapper.c
---

3e0a1a71e951bfb29bd43c6341b2e72f4386377f
diff --cc ext/standard/http_fopen_wrapper.c
index 1f54f62c6c,eb371c4308..457e806440
--- a/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;
  			}