diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-10-20 05:23:21 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-10-20 05:23:21 +0100 |
| commit | 5de20ef3ae46daf4414866c094e2ae72790ef1ff (patch) | |
| tree | 9b64cd2f3704764dc5a6b0c9dbe60a524f757b61 /ext/soap | |
| parent | 565ce0d41d6e09f23a4fe062a5a0f0caf3ea727a (diff) | |
| parent | 3b9ba6195db2c17147b0fed4af3398320967002f (diff) | |
| download | php-git-5de20ef3ae46daf4414866c094e2ae72790ef1ff.tar.gz | |
Merge branch 'pull-request/2152' into PHP-7.1
Diffstat (limited to 'ext/soap')
| -rw-r--r-- | ext/soap/php_http.c | 9 | ||||
| -rw-r--r-- | ext/soap/soap.c | 2 | ||||
| -rw-r--r-- | ext/soap/tests/bug69137.phpt | 46 |
3 files changed, 56 insertions, 1 deletions
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index dd87ec1214..7a6562c2e2 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -161,7 +161,7 @@ void http_context_headers(php_stream_context* context, static php_stream* http_connect(zval* this_ptr, php_url *phpurl, int use_ssl, php_stream_context *context, int *use_proxy) { php_stream *stream; - zval *proxy_host, *proxy_port, *tmp; + zval *proxy_host, *proxy_port, *tmp, ssl_proxy_peer_name; char *host; char *name; char *protocol; @@ -241,6 +241,13 @@ static php_stream* http_connect(zval* this_ptr, php_url *phpurl, int use_ssl, ph if (stream && *use_proxy && use_ssl) { smart_str soap_headers = {0}; + /* Set peer_name or name verification will try to use the proxy server name */ + if (!context || (tmp = php_stream_context_get_option(context, "ssl", "peer_name")) == NULL) { + ZVAL_STRING(&ssl_proxy_peer_name, phpurl->host); + php_stream_context_set_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_name", &ssl_proxy_peer_name); + zval_ptr_dtor(&ssl_proxy_peer_name); + } + smart_str_append_const(&soap_headers, "CONNECT "); smart_str_appends(&soap_headers, phpurl->host); smart_str_appendc(&soap_headers, ':'); diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 23bbfb6e84..73b7616437 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2366,6 +2366,8 @@ PHP_METHOD(SoapClient, SoapClient) Z_TYPE_P(tmp) == IS_RESOURCE) { context = php_stream_context_from_zval(tmp, 1); Z_ADDREF_P(tmp); + } else { + context = php_stream_context_alloc(); } if ((tmp = zend_hash_str_find(ht, "location", sizeof("location")-1)) != NULL && diff --git a/ext/soap/tests/bug69137.phpt b/ext/soap/tests/bug69137.phpt new file mode 100644 index 0000000000..9160b91c25 --- /dev/null +++ b/ext/soap/tests/bug69137.phpt @@ -0,0 +1,46 @@ +--TEST-- +SOAP Bug #69137 - Peer verification fails when using a proxy with SoapClient +--SKIPIF-- +<?php +require_once('skipif.inc'); +if (getenv("SKIP_ONLINE_TESTS")) { die("skip test requiring internet connection"); } +if (!getenv('http_proxy')) { die("skip test unless an HTTP/HTTPS proxy server is specified in http_proxy environment variable"); } +?> +--INI-- +soap.wsdl_cache_enabled=1 +--FILE-- +<?php + +class IpLookup +{ + public $licenseKey; + public $ipAddress; +} + +list ($proxyHost, $proxyPort) = explode(':', str_replace('http://', '', $_ENV['http_proxy'])); + +// Prime the WSDL cache because that request sets peer_name on the HTTP context +// and masks the SOAP bug. +$testServiceWsdl = 'https://ws.cdyne.com/ip2geo/ip2geo.asmx?wsdl'; +$client = new SoapClient($testServiceWsdl); +unset($client); + +$parameters = [ + 'proxy_host' => $proxyHost, + 'proxy_port' => $proxyPort, + 'trace' => 1, +]; +$client = new SoapClient($testServiceWsdl, $parameters); + +$lookup = new IpLookup(); +$lookup->licenseKey = 0; +$lookup->ipAddress = '72.52.91.14'; + +$result = $client->ResolveIP($lookup); + +if ($result && is_object($result) && $result->ResolveIPResult && is_object($result->ResolveIPResult)) { + print "successful lookup"; +} +?> +--EXPECT-- +successful lookup |