dmitry Wed May 5 06:52:34 2004 EDT
Added files:
/php-src/ext/soap/tests server021.phpt
Modified files:
/php-src/ext/soap soap.c
Log:
Support for classes with __call() method on server side.
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.101&r2=1.102&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.101 php-src/ext/soap/soap.c:1.102
--- php-src/ext/soap/soap.c:1.101 Wed May 5 06:31:26 2004
+++ php-src/ext/soap/soap.c Wed May 5 06:52:33 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.101 2004/05/05 10:31:26 dmitry Exp $ */
+/* $Id: soap.c,v 1.102 2004/05/05 10:52:33 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1513,7 +1513,9 @@
}
fn_name = estrndup(Z_STRVAL(function_name),Z_STRLEN(function_name));
- if (zend_hash_exists(function_table, php_strtolower(fn_name,
Z_STRLEN(function_name)), Z_STRLEN(function_name) + 1)) {
+ if (zend_hash_exists(function_table, php_strtolower(fn_name,
Z_STRLEN(function_name)), Z_STRLEN(function_name) + 1) ||
+ (service->type == SOAP_CLASS &&
+ zend_hash_exists(function_table, ZEND_CALL_FUNC_NAME,
sizeof(ZEND_CALL_FUNC_NAME)))) {
if (service->type == SOAP_CLASS) {
call_status = call_user_function(NULL, &soap_obj,
&function_name, &retval, num_params, params TSRMLS_CC);
#if HAVE_PHP_SESSION
http://cvs.php.net/co.php/php-src/ext/soap/tests/server021.phpt?r=1.1&p=1
Index: php-src/ext/soap/tests/server021.phpt
+++ php-src/ext/soap/tests/server021.phpt
--TEST--
SOAP Server 21: SoapServer::setClass and __call()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
class Foo {
function __call($name) {
if ($name == "test") {
return "Hello World";
} else {
return SoapFault("Server","Function $name doesn't exist");
}
}
}
$server = new soapserver(null,array('uri'=>"http://testuri.org";));
$server->setclass("Foo");
$HTTP_RAW_POST_DATA = <<<EOF
<?xml version="1.0" encoding="ISO-8859-1"?>
<SOAP-ENV:Envelope
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:si="http://soapinterop.org/xsd";>
<SOAP-ENV:Body>
<ns1:test xmlns:ns1="http://testuri.org"; />
</SOAP-ENV:Body>
</SOAP-ENV:Envelope>
EOF;
$server->handle();
echo "ok\n";
?>
--EXPECT--
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns:ns1="http://testuri.org"; xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/";
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";><SOAP-ENV:Body><ns1:testResponse><return
xsi:type="xsd:string">Hello
World</return></ns1:testResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
ok
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
