diff options
| author | Dmitry Stogov <dmitry@php.net> | 2004-09-10 09:02:06 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2004-09-10 09:02:06 +0000 |
| commit | f8181ba7b5a0997a7aa45e9a9ba4259e927bd90f (patch) | |
| tree | 75fae56804d944a70bbca2d703cbcc680b7f20df | |
| parent | f93560ddc922a8e255084733f8d627cd3372f27e (diff) | |
| download | php-git-f8181ba7b5a0997a7aa45e9a9ba4259e927bd90f.tar.gz | |
SoapClient->__call() is renamed to SoapClient->__soap_call().
| -rw-r--r-- | ext/soap/interop/client_round2_interop.php | 6 | ||||
| -rw-r--r-- | ext/soap/soap.c | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php index a8a3fad810..d8246a45d1 100644 --- a/ext/soap/interop/client_round2_interop.php +++ b/ext/soap/interop/client_round2_interop.php @@ -94,7 +94,7 @@ class Interop_Client $this->_getEndpoints($test, 1); // retreive endpoints from the endpoint server - $endpointArray = $soapclient->__call("GetEndpointInfo",array("groupName"=>$test),array('soapaction'=>"http://soapinterop.org/",'uri'=>"http://soapinterop.org/")); + $endpointArray = $soapclient->__soap_call("GetEndpointInfo",array("groupName"=>$test),array('soapaction'=>"http://soapinterop.org/",'uri'=>"http://soapinterop.org/")); if (is_soap_fault($endpointArray) || PEAR::isError($endpointArray)) { if ($this->html) print "<pre>"; print $soapclient->wire."\n"; @@ -428,9 +428,9 @@ try { $return = eval('return $soap->'.$soap_test->method_name.'('.$args.');'); } else { if ($soap_test->headers || $soap_test->headers_expect) { - $return = $soap->__call($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace), $soap_test->headers, $result_headers); + $return = $soap->__soap_call($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace), $soap_test->headers, $result_headers); } else { - $return = $soap->__call($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace)); + $return = $soap->__soap_call($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace)); } } } catch (SoapFault $ex) { diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 063561e064..521c103ecd 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -288,13 +288,26 @@ ZEND_BEGIN_ARG_INFO(__call_args, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO(__soap_call_args, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) +ZEND_END_ARG_INFO() #else -unsigned char __call_args[] = { 5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; +unsigned char __call_args[] = { 2, BYREF_NONE, BYREF_NONE }; +unsigned char __soap_call_args[] = { 5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; #endif static zend_function_entry soap_client_functions[] = { PHP_ME(SoapClient, SoapClient, NULL, 0) PHP_ME(SoapClient, __call, __call_args, 0) +#ifdef ZEND_ENGINE_2 + ZEND_FENTRY(__soap_call, ZEND_FN(SoapClient___call), __soap_call_args, 0) +#else + ZEND_NAMED_FE(__soap_call, ZEND_FN(SoapClient___call), __soap_call_args) +#endif PHP_ME(SoapClient, __getLastRequest, NULL, 0) PHP_ME(SoapClient, __getLastResponse, NULL, 0) PHP_ME(SoapClient, __getLastRequestHeaders, NULL, 0) |