dmitry Thu Aug 24 06:18:30 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests server026.phpt server027.phpt
server028.phpt
Modified files:
/php-src NEWS
/php-src/ext/soap php_soap.h soap.c
Log:
Added SoapServer::setObject() method (it is a simplified version of
SoapServer::setClass() method).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.217&r2=1.2027.2.547.2.218&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.217 php-src/NEWS:1.2027.2.547.2.218
--- php-src/NEWS:1.2027.2.547.2.217 Wed Aug 23 20:22:31 2006
+++ php-src/NEWS Thu Aug 24 06:18:30 2006
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Sep 2006, PHP 5.2.0
+- Added SoapServer::setObject() method (it is a simplified version of
+ SoapServer::setClass() method). (Dmitry)
- Added support for hexadecimal entity in imagettftext() for the bundled GD.
(Pierre)
- Fixed bug #38543 (shutdown_executor() may segfault when memory_limit is too
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_soap.h?r1=1.38.2.6&r2=1.38.2.6.2.1&diff_format=u
Index: php-src/ext/soap/php_soap.h
diff -u php-src/ext/soap/php_soap.h:1.38.2.6
php-src/ext/soap/php_soap.h:1.38.2.6.2.1
--- php-src/ext/soap/php_soap.h:1.38.2.6 Wed Apr 19 10:48:54 2006
+++ php-src/ext/soap/php_soap.h Thu Aug 24 06:18:30 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_soap.h,v 1.38.2.6 2006/04/19 10:48:54 dmitry Exp $ */
+/* $Id: php_soap.h,v 1.38.2.6.2.1 2006/08/24 06:18:30 dmitry Exp $ */
#ifndef PHP_SOAP_H
#define PHP_SOAP_H
@@ -114,6 +114,8 @@
int persistance;
} soap_class;
+ zval *soap_object;
+
HashTable *mapping;
int version;
int type;
@@ -127,6 +129,7 @@
#define SOAP_CLASS 1
#define SOAP_FUNCTIONS 2
+#define SOAP_OBJECT 3
#define SOAP_FUNCTIONS_ALL 999
#define SOAP_MAP_FUNCTION 1
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.8&r2=1.156.2.28.2.9&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.8
php-src/ext/soap/soap.c:1.156.2.28.2.9
--- php-src/ext/soap/soap.c:1.156.2.28.2.8 Mon Jul 31 15:31:01 2006
+++ php-src/ext/soap/soap.c Thu Aug 24 06:18:30 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.8 2006/07/31 15:31:01 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.9 2006/08/24 06:18:30 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -239,6 +239,7 @@
/* Server Functions */
PHP_METHOD(SoapServer, SoapServer);
PHP_METHOD(SoapServer, setClass);
+PHP_METHOD(SoapServer, setObject);
PHP_METHOD(SoapServer, addFunction);
PHP_METHOD(SoapServer, getFunctions);
PHP_METHOD(SoapServer, handle);
@@ -302,6 +303,7 @@
SOAP_CTOR(SoapServer, SoapServer, NULL, 0)
PHP_ME(SoapServer, setPersistence, NULL, 0)
PHP_ME(SoapServer, setClass, NULL, 0)
+ PHP_ME(SoapServer, setObject, NULL, 0)
PHP_ME(SoapServer, addFunction, NULL, 0)
PHP_ME(SoapServer, getFunctions, NULL, 0)
PHP_ME(SoapServer, handle, NULL, 0)
@@ -1257,6 +1259,33 @@
/* }}} */
+/* {{{ proto void SoapServer::setObject(object)
+ Sets object which will handle SOAP requests */
+PHP_METHOD(SoapServer, setObject)
+{
+ soapServicePtr service;
+ zval *obj;
+
+ SOAP_SERVER_BEGIN_CODE();
+
+ FETCH_THIS_SERVICE(service);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &obj) ==
FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid parameters");
+ }
+
+ service->type = SOAP_OBJECT;
+
+ MAKE_STD_ZVAL(service->soap_object);
+ *service->soap_object = *obj;
+ zval_copy_ctor(service->soap_object);
+ INIT_PZVAL(service->soap_object);
+
+ SOAP_SERVER_END_CODE();
+}
+/* }}} */
+
+
/* {{{ proto array SoapServer::getFunctions(void)
Returns list of defined functions */
PHP_METHOD(SoapServer, getFunctions)
@@ -1270,7 +1299,9 @@
FETCH_THIS_SERVICE(service);
array_init(return_value);
- if (service->type == SOAP_CLASS) {
+ if (service->type == SOAP_OBJECT) {
+ ft = &(Z_OBJCE_P(service->soap_object)->function_table);
+ } else if (service->type == SOAP_CLASS) {
ft = &service->soap_class.ce->function_table;
} else if (service->soap_functions.functions_all == TRUE) {
ft = EG(function_table);
@@ -1289,7 +1320,7 @@
HashPosition pos;
zend_hash_internal_pointer_reset_ex(ft, &pos);
while (zend_hash_get_current_data_ex(ft, (void **)&f, &pos) !=
FAILURE) {
- if ((service->type != SOAP_CLASS) ||
(f->common.fn_flags & ZEND_ACC_PUBLIC)) {
+ if ((service->type != SOAP_OBJECT && service->type !=
SOAP_CLASS) || (f->common.fn_flags & ZEND_ACC_PUBLIC)) {
add_next_index_string(return_value,
f->common.function_name, 1);
}
zend_hash_move_forward_ex(ft, &pos);
@@ -1563,7 +1594,10 @@
service->soap_headers_ptr = &soap_headers;
soap_obj = NULL;
- if (service->type == SOAP_CLASS) {
+ if (service->type == SOAP_OBJECT) {
+ soap_obj = service->soap_object;
+ function_table = &((Z_OBJCE_P(soap_obj))->function_table);
+ } else if (service->type == SOAP_CLASS) {
#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
/* If persistent then set soap_obj from from the previous
created session (if available) */
if (service->soap_class.persistance ==
SOAP_PERSISTENCE_SESSION) {
@@ -1666,7 +1700,6 @@
#endif
}
-/* function_table =
&(soap_obj->value.obj.ce->function_table);*/
function_table = &((Z_OBJCE_P(soap_obj))->function_table);
} else {
if (service->soap_functions.functions_all == TRUE) {
@@ -1695,9 +1728,9 @@
fn_name =
estrndup(Z_STRVAL(h->function_name),Z_STRLEN(h->function_name));
if (zend_hash_exists(function_table,
php_strtolower(fn_name, Z_STRLEN(h->function_name)), Z_STRLEN(h->function_name)
+ 1) ||
- (service->type == SOAP_CLASS &&
+ ((service->type == SOAP_CLASS || service->type ==
SOAP_OBJECT) &&
zend_hash_exists(function_table,
ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) {
- if (service->type == SOAP_CLASS) {
+ if (service->type == SOAP_CLASS ||
service->type == SOAP_OBJECT) {
call_status = call_user_function(NULL,
&soap_obj, &h->function_name, &h->retval, h->num_params, h->parameters
TSRMLS_CC);
} else {
call_status =
call_user_function(EG(function_table), NULL, &h->function_name, &h->retval,
h->num_params, h->parameters TSRMLS_CC);
@@ -1716,7 +1749,7 @@
php_end_ob_buffer(0, 0 TSRMLS_CC);
soap_server_fault_ex(function,
&h->retval, h TSRMLS_CC);
efree(fn_name);
- if (soap_obj)
{zval_ptr_dtor(&soap_obj);}
+ if (service->type == SOAP_CLASS &&
soap_obj) {zval_ptr_dtor(&soap_obj);}
goto fail;
#ifdef ZEND_ENGINE_2
} else if (EG(exception)) {
@@ -1732,7 +1765,7 @@
soap_server_fault_ex(function,
EG(exception), h TSRMLS_CC);
}
efree(fn_name);
- if (soap_obj)
{zval_ptr_dtor(&soap_obj);}
+ if (service->type == SOAP_CLASS &&
soap_obj) {zval_ptr_dtor(&soap_obj);}
goto fail;
#endif
}
@@ -1745,17 +1778,19 @@
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) ||
- (service->type == SOAP_CLASS &&
+ ((service->type == SOAP_CLASS || service->type == SOAP_OBJECT) &&
zend_hash_exists(function_table, ZEND_CALL_FUNC_NAME,
sizeof(ZEND_CALL_FUNC_NAME)))) {
- if (service->type == SOAP_CLASS) {
+ if (service->type == SOAP_CLASS || service->type ==
SOAP_OBJECT) {
call_status = call_user_function(NULL, &soap_obj,
&function_name, &retval, num_params, params TSRMLS_CC);
+ if (service->type == SOAP_CLASS) {
#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
- if (service->soap_class.persistance !=
SOAP_PERSISTENCE_SESSION) {
- zval_ptr_dtor(&soap_obj);
- }
+ if (service->soap_class.persistance !=
SOAP_PERSISTENCE_SESSION) {
+ zval_ptr_dtor(&soap_obj);
+ }
#else
- zval_ptr_dtor(&soap_obj);
+ zval_ptr_dtor(&soap_obj);
#endif
+ }
} else {
call_status = call_user_function(EG(function_table),
NULL, &function_name, &retval, num_params, params TSRMLS_CC);
}
@@ -1771,12 +1806,14 @@
instanceof_function(Z_OBJCE_P(EG(exception)),
soap_fault_class_entry TSRMLS_CC)) {
soap_server_fault_ex(function, EG(exception), NULL
TSRMLS_CC);
}
+ if (service->type == SOAP_CLASS) {
#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
- if (soap_obj && service->soap_class.persistance !=
SOAP_PERSISTENCE_SESSION) {
+ if (soap_obj && service->soap_class.persistance !=
SOAP_PERSISTENCE_SESSION) {
#else
- if (soap_obj) {
+ if (soap_obj) {
#endif
- zval_ptr_dtor(&soap_obj);
+ zval_ptr_dtor(&soap_obj);
+ }
}
goto fail;
}
@@ -4593,5 +4630,8 @@
zend_hash_destroy(service->class_map);
FREE_HASHTABLE(service->class_map);
}
+ if (service->soap_object) {
+ zval_ptr_dtor(&service->soap_object);
+ }
efree(service);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/server026.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/server026.phpt
+++ php-src/ext/soap/tests/server026.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/server027.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/server027.phpt
+++ php-src/ext/soap/tests/server027.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/server028.phpt?view=markup&rev=1.1
Index: php-src/ext/soap/tests/server028.phpt
+++ php-src/ext/soap/tests/server028.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
