cvs: php-src /ext/soap soap.c /ext/soap/interop client_round2_interop.php

dmitry Fri Sep 10 05:02:06 2004 EDT Modified files: /php-src/ext/soap soap.c /php-src/ext/soap/interop client_round2_interop.php Log: SoapClient->__call() is renamed to SoapClient->__soap_call(). http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.118&r2=1.119&ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.118 php-src/ext/soap/soap.c:1.119 --- php-src/ext/soap/soap.c:1.118 Thu Sep 9 05:53:53 2004 +++ php-src/ext/soap/soap.c Fri Sep 10 05:02:05 2004 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.118 2004/09/09 09:53:53 helly Exp $ */ +/* $Id: soap.c,v 1.119 2004/09/10 09:02:05 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -288,13 +288,26 @@ 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) http://cvs.php.net/diff.php/php-src/ext/soap/interop/client_round2_interop.php?r1=1.15&r2=1.16&ty=u Index: php-src/ext/soap/interop/client_round2_interop.php diff -u php-src/ext/soap/interop/client_round2_interop.php:1.15 php-src/ext/soap/interop/client_round2_interop.php:1.16 --- php-src/ext/soap/interop/client_round2_interop.php:1.15 Thu Apr 1 09:37:03 2004 +++ php-src/ext/soap/interop/client_round2_interop.php Fri Sep 10 05:02:06 2004 @@ -16,7 +16,7 @@ // | Authors: Shane Caraveo <Shane@Caraveo.com> | // +----------------------------------------------------------------------+ // -// $Id: client_round2_interop.php,v 1.15 2004/04/01 14:37:03 dmitry Exp $ +// $Id: client_round2_interop.php,v 1.16 2004/09/10 09:02:06 dmitry Exp $ // require_once 'DB.php'; // PEAR/DB require_once 'client_round2_params.php'; @@ -94,7 +94,7 @@ $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 @@ $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) {