diff options
| author | Dmitry Stogov <dmitry@php.net> | 2004-01-29 15:32:06 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2004-01-29 15:32:06 +0000 |
| commit | 05114460bab1ba78ab9f051ee7d4b5e2d00dfe65 (patch) | |
| tree | 56be1d2ee243b7a61a78eb84177474b95e4ad31f | |
| parent | dfaa06dbd76a2e5a1d88ca281b9a4b5804e4b077 (diff) | |
| download | php-git-05114460bab1ba78ab9f051ee7d4b5e2d00dfe65.tar.gz | |
Rollback: persistent PHP streams (dont work with "kafka")
| -rw-r--r-- | ext/soap/php_http.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 6c2d966091..eff42f5cad 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -151,21 +151,12 @@ int send_http_soap_request(zval *this_ptr, xmlDoc *doc, char *location, char *so old_error_reporting = EG(error_reporting); EG(error_reporting) &= ~(E_WARNING|E_NOTICE|E_USER_WARNING|E_USER_NOTICE); -#ifdef ZTS stream = php_stream_xport_create(res, reslen, ENFORCE_SAFE_MODE | REPORT_ERRORS, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, NULL /*persistent_id*/, NULL /*timeout*/, NULL, NULL, NULL); -#else - stream = php_stream_xport_create(res, reslen, - ENFORCE_SAFE_MODE | REPORT_ERRORS, - STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, - res /*persistent_id*/, - NULL /*timeout*/, - NULL, NULL, NULL); -#endif EG(error_reporting) = old_error_reporting; efree(res); @@ -183,13 +174,7 @@ int send_http_soap_request(zval *this_ptr, xmlDoc *doc, char *location, char *so zend_hash_find(Z_OBJPROP_P(this_ptr), "_proxy_port", sizeof("_proxy_port"), (void **) &proxy_port) == SUCCESS && Z_TYPE_PP(proxy_port) == IS_LONG) { use_proxy = 1; -#ifdef ZTS stream = php_stream_sock_open_host(Z_STRVAL_PP(proxy_host), Z_LVAL_PP(proxy_port), SOCK_STREAM, NULL, NULL); -#else - spprintf(&res, 0, "tcp://%s:%ld", Z_STRVAL_PP(proxy_host), Z_LVAL_PP(proxy_port)); - stream = php_stream_sock_open_host(Z_STRVAL_PP(proxy_host), Z_LVAL_PP(proxy_port), SOCK_STREAM, NULL, res); - efree(res); -#endif } else { #ifdef ZTS stream = php_stream_sock_open_host(phpurl->host, (unsigned short)phpurl->port, SOCK_STREAM, NULL, NULL); |