summaryrefslogtreecommitdiff
path: root/ext/soap/php_soap.h
diff options
context:
space:
mode:
Diffstat (limited to 'ext/soap/php_soap.h')
-rw-r--r--ext/soap/php_soap.h32
1 files changed, 8 insertions, 24 deletions
diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h
index f652ef094..56841218f 100644
--- a/ext/soap/php_soap.h
+++ b/ext/soap/php_soap.h
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $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.2 2006/09/20 13:42:50 dmitry Exp $ */
#ifndef PHP_SOAP_H
#define PHP_SOAP_H
@@ -35,10 +35,6 @@
#include <libxml/parser.h>
#include <libxml/xpath.h>
-#ifdef HAVE_PHP_DOMXML
-# include "ext/domxml/php_domxml.h"
-#endif
-
#ifndef PHP_HAVE_STREAMS
# error You lose - must be compiled against PHP 4.3.0 or later
#endif
@@ -78,23 +74,8 @@ typedef struct _soapService soapService, *soapServicePtr;
#include "php_packet_soap.h"
struct _soapMapping {
- char *ns;
- char *ctype;
- int type;
-
- struct _map_functions {
- zval *to_xml_before;
- zval *to_xml;
- zval *to_xml_after;
- zval *to_zval_before;
- zval *to_zval;
- zval *to_zval_after;
- } map_functions;
-
- struct _map_class {
- int type;
- zend_class_entry *ce;
- } map_class;
+ zval *to_xml;
+ zval *to_zval;
};
struct _soapHeader;
@@ -114,7 +95,9 @@ struct _soapService {
int persistance;
} soap_class;
- HashTable *mapping;
+ zval *soap_object;
+
+ HashTable *typemap;
int version;
int type;
char *actor;
@@ -127,6 +110,7 @@ struct _soapService {
#define SOAP_CLASS 1
#define SOAP_FUNCTIONS 2
+#define SOAP_OBJECT 3
#define SOAP_FUNCTIONS_ALL 999
#define SOAP_MAP_FUNCTION 1
@@ -167,7 +151,7 @@ ZEND_BEGIN_MODULE_GLOBALS(soap)
HashTable defEncNs; /* mapping of default namespaces to prefixes */
HashTable defEnc;
HashTable defEncIndex;
- HashTable *overrides;
+ HashTable *typemap;
int cur_uniq_ns;
int soap_version;
sdlPtr sdl;