diff options
| author | Pierrick Charron <pierrick@php.net> | 2011-11-18 13:24:35 +0000 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2011-11-18 13:24:35 +0000 |
| commit | 34bb8d8119e6bcbcc08f46e6bbc34d1e790f3e65 (patch) | |
| tree | 7137f908bf7e0ccac0018c9e94a6afab64e2b4a2 | |
| parent | a65abc12b6f9608cc995f8bc7098f1ec91442996 (diff) | |
| download | php-git-34bb8d8119e6bcbcc08f46e6bbc34d1e790f3e65.tar.gz | |
Added new SoapClient option "keep_alive". FR #60329
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/soap/php_http.c | 8 | ||||
| -rw-r--r-- | ext/soap/soap.c | 5 |
3 files changed, 13 insertions, 3 deletions
@@ -31,6 +31,9 @@ PHP NEWS . Fixed bug #60282 (Segfault when using ob_gzhandler() with open buffers). (Laruence) +- SOAP extension: + . Added new SoapClient option "keep_alive". FR #60329. (Pierrick) + - Tidy: . Fixed bug #54682 (Tidy::diagnose() NULL pointer dereference). (Maksymilian Arciemowicz, Felipe) diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 1ca0a1610b..e79c537992 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -433,12 +433,14 @@ try_again: smart_str_appendc(&soap_headers, ':'); smart_str_append_unsigned(&soap_headers, phpurl->port); } - if (http_1_1) { + if (!http_1_1 || + (zend_hash_find(Z_OBJPROP_P(this_ptr), "_keep_alive", sizeof("_keep_alive"), (void **)&tmp) == SUCCESS && + Z_LVAL_PP(tmp) == 0)) { smart_str_append_const(&soap_headers, "\r\n" - "Connection: Keep-Alive\r\n"); + "Connection: close\r\n"); } else { smart_str_append_const(&soap_headers, "\r\n" - "Connection: close\r\n"); + "Connection: Keep-Alive\r\n"); } if (zend_hash_find(Z_OBJPROP_P(this_ptr), "_user_agent", sizeof("_user_agent"), (void **)&tmp) == SUCCESS && Z_TYPE_PP(tmp) == IS_STRING) { diff --git a/ext/soap/soap.c b/ext/soap/soap.c index aa6cf65e09..f9adb3fb2f 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2469,6 +2469,11 @@ PHP_METHOD(SoapClient, SoapClient) Z_TYPE_PP(tmp) == IS_STRING) { add_property_stringl(this_ptr, "_user_agent", Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1); } + + if (zend_hash_find(ht, "keep_alive", sizeof("keep_alive"), (void**)&tmp) == SUCCESS && + (Z_TYPE_PP(tmp) == IS_BOOL || Z_TYPE_PP(tmp) == IS_LONG) && Z_LVAL_PP(tmp) == 0) { + add_property_long(this_ptr, "_keep_alive", 0); + } } else if (Z_TYPE_P(wsdl) == IS_NULL) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "'location' and 'uri' options are required in nonWSDL mode"); } |