diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-07-20 10:21:49 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-07-20 10:21:49 +0000 |
| commit | e07d2f4803b0ffe7d6177b339184b8c9c9937bf3 (patch) | |
| tree | 25143fa006a69a8ff13848ac69efcd9f8b92d228 /ext/soap/php_http.c | |
| parent | 3102638061edb89cd5c5586252a4b69aa5033f44 (diff) | |
| download | php-git-e07d2f4803b0ffe7d6177b339184b8c9c9937bf3.tar.gz | |
"_local_cert" and "_passphrase" properties moved into "_stream_context".
As a result now it is possible to use certificates during access WSDL files.
Diffstat (limited to 'ext/soap/php_http.c')
| -rw-r--r-- | ext/soap/php_http.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 9130cd60d2..70c16645f6 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -142,23 +142,10 @@ static php_stream* http_connect(zval* this_ptr, php_url *phpurl, int use_ssl, in if (SUCCESS == zend_hash_find(Z_OBJPROP_P(this_ptr), "_stream_context", sizeof("_stream_context"), (void**)&tmp)) { context = php_stream_context_from_zval(*tmp, 0); - } else { - context = php_stream_context_alloc(); } namelen = spprintf(&name, 0, "%s://%s:%d", (use_ssl && !*use_proxy)? "ssl" : "tcp", host, port); - if (use_ssl) { - zval **tmp; - - if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_local_cert", sizeof("_local_cert"), (void **) &tmp) == SUCCESS && - Z_TYPE_PP(tmp) == IS_STRING) { - php_stream_context_set_option(context, "ssl", "local_cert", *tmp); - if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_passphrase", sizeof("_passphrase"), (void **) &tmp) == SUCCESS && - Z_TYPE_PP(tmp) == IS_STRING) { - php_stream_context_set_option(context, "ssl", "passphrase", *tmp); - } - } - } + stream = php_stream_xport_create(name, namelen, ENFORCE_SAFE_MODE | REPORT_ERRORS, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, |