Merge from trunk
[plcapi.git] / trunk / php / xmlrpc / xmlrpc-epi-php.c
diff --git a/trunk/php/xmlrpc/xmlrpc-epi-php.c b/trunk/php/xmlrpc/xmlrpc-epi-php.c
new file mode 100644 (file)
index 0000000..d668067
--- /dev/null
@@ -0,0 +1,1528 @@
+/*
+  This file is part of, or distributed with, libXMLRPC - a C library for 
+  xml-encoded function calls.
+
+  Author: Dan Libby (dan@libby.com)
+  Epinions.com may be contacted at feedback@epinions-inc.com
+*/
+
+/*  
+  Copyright 2001 Epinions, Inc. 
+
+  Subject to the following 3 conditions, Epinions, Inc.  permits you, free 
+  of charge, to (a) use, copy, distribute, modify, perform and display this 
+  software and associated documentation files (the "Software"), and (b) 
+  permit others to whom the Software is furnished to do so as well.  
+
+  1) The above copyright notice and this permission notice shall be included 
+  without modification in all copies or substantial portions of the 
+  Software.  
+
+  2) THE SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY WARRANTY OR CONDITION OF 
+  ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION ANY 
+  IMPLIED WARRANTIES OF ACCURACY, MERCHANTABILITY, FITNESS FOR A PARTICULAR 
+  PURPOSE OR NONINFRINGEMENT.  
+
+  3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, 
+  SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT 
+  OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING 
+  NEGLIGENCE), EVEN IF EPINIONS, INC.  IS AWARE OF THE POSSIBILITY OF SUCH 
+  DAMAGES.    
+
+*/
+
+/* auto-generated portions of this file are also subject to the php license */
+
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2004 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.0 of the PHP license,       |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_0.txt.                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Dan Libby                                                    |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+/**********************************************************************
+* BUGS:                                                               *
+*  - when calling a php user function, there appears to be no way to  *
+*    distinguish between a return value of null, and no return value  *
+*    at all.  The xml serialization layer(s) will then return a value *
+*    of null, when the right thing may be no value at all. (SOAP)     *
+**********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "ext/standard/info.h"
+#include "php_ini.h"
+#include "php_xmlrpc.h"
+#include "xmlrpc.h"
+
+#define PHP_EXT_VERSION "0.51"
+
+/* You should tweak config.m4 so this symbol (or some else suitable)
+       gets defined.  */
+
+ZEND_DECLARE_MODULE_GLOBALS(xmlrpc)
+
+static int le_xmlrpc_server;
+
+function_entry xmlrpc_functions[] = {
+       PHP_FE(xmlrpc_encode,                                                                   NULL) 
+       PHP_FE(xmlrpc_decode,                                                                   NULL)
+       PHP_FE(xmlrpc_decode_request,                                                   second_arg_force_ref)
+       PHP_FE(xmlrpc_encode_request,                                                   NULL)
+       PHP_FE(xmlrpc_get_type,                                                                 NULL)
+       PHP_FE(xmlrpc_set_type,                                                                 first_arg_force_ref)
+       PHP_FE(xmlrpc_is_fault,                                                                 NULL)
+       PHP_FE(xmlrpc_server_create,                                                    NULL)
+       PHP_FE(xmlrpc_server_destroy,                                                   NULL)
+       PHP_FE(xmlrpc_server_register_method,                                   NULL)
+       PHP_FE(xmlrpc_server_call_method,                                               NULL)
+       PHP_FE(xmlrpc_parse_method_descriptions,                                NULL)
+       PHP_FE(xmlrpc_server_add_introspection_data,                    NULL)
+       PHP_FE(xmlrpc_server_register_introspection_callback,   NULL)
+       {NULL, NULL, NULL}
+};
+
+zend_module_entry xmlrpc_module_entry = {
+       STANDARD_MODULE_HEADER,
+       "xmlrpc",
+       xmlrpc_functions,
+       PHP_MINIT(xmlrpc),
+       PHP_MSHUTDOWN(xmlrpc),
+       PHP_RINIT(xmlrpc),      /* Replace with NULL if there's nothing to do at request start */
+       PHP_RSHUTDOWN(xmlrpc),  /* Replace with NULL if there's nothing to do at request end */
+       PHP_MINFO(xmlrpc),
+       PHP_EXT_VERSION,
+       STANDARD_MODULE_PROPERTIES
+};
+
+#ifdef COMPILE_DL_XMLRPC
+ZEND_GET_MODULE(xmlrpc)
+# ifdef PHP_WIN32
+# include "zend_arg_defs.c"
+# endif
+#endif
+
+PHP_INI_BEGIN()
+STD_PHP_INI_BOOLEAN("xmlrpc.allow_null", "0", PHP_INI_ALL, OnUpdateBool, allow_null, zend_xmlrpc_globals, xmlrpc_globals)
+PHP_INI_END()
+
+static void php_xmlrpc_init_globals(zend_xmlrpc_globals *xmlrpc_globals)
+{
+       memset(xmlrpc_globals, 0, sizeof(zend_xmlrpc_globals));
+}
+
+/*******************************
+* local structures and defines *
+*******************************/
+
+/* per server data */
+typedef struct _xmlrpc_server_data {
+       zval* method_map;
+       zval* introspection_map;
+       XMLRPC_SERVER server_ptr;
+} xmlrpc_server_data;
+
+
+/* how to format output */
+typedef struct _php_output_options {
+       int b_php_out;
+       int b_auto_version;
+       int b_allow_null;
+       STRUCT_XMLRPC_REQUEST_OUTPUT_OPTIONS xmlrpc_out;
+} php_output_options;
+
+/* data passed to C callback */
+typedef struct _xmlrpc_callback_data {
+       zval* xmlrpc_method;
+       zval* php_function;
+       zval* caller_params;
+       zval* return_data;
+       xmlrpc_server_data* server;
+       char php_executed;
+} xmlrpc_callback_data;
+
+/* output options */
+#define OUTPUT_TYPE_KEY       "output_type"
+#define OUTPUT_TYPE_KEY_LEN   (sizeof(OUTPUT_TYPE_KEY) - 1)
+#define OUTPUT_TYPE_VALUE_PHP "php"
+#define OUTPUT_TYPE_VALUE_XML "xml"
+
+#define ALLOW_NULL_KEY     "allow_null"
+#define ALLOW_NULL_KEY_LEN (sizeof(ALLOW_NULL_KEY) - 1)
+
+#define VERBOSITY_KEY                  "verbosity"
+#define VERBOSITY_KEY_LEN              (sizeof(VERBOSITY_KEY) - 1)
+#define VERBOSITY_VALUE_NO_WHITE_SPACE "no_white_space"
+#define VERBOSITY_VALUE_NEWLINES_ONLY  "newlines_only"
+#define VERBOSITY_VALUE_PRETTY         "pretty"
+
+#define ESCAPING_KEY             "escaping"
+#define ESCAPING_KEY_LEN         (sizeof(ESCAPING_KEY) - 1)
+#define ESCAPING_VALUE_CDATA     "cdata"
+#define ESCAPING_VALUE_NON_ASCII "non-ascii"
+#define ESCAPING_VALUE_NON_PRINT "non-print"
+#define ESCAPING_VALUE_MARKUP    "markup"
+
+#define VERSION_KEY          "version"
+#define VERSION_KEY_LEN      (sizeof(VERSION_KEY) - 1)
+#define VERSION_VALUE_SIMPLE "simple"
+#define VERSION_VALUE_XMLRPC "xmlrpc"
+#define VERSION_VALUE_SOAP11 "soap 1.1"
+#define VERSION_VALUE_AUTO   "auto"
+
+#define ENCODING_KEY     "encoding"
+#define ENCODING_KEY_LEN (sizeof(ENCODING_KEY) - 1)
+#define ENCODING_DEFAULT "iso-8859-1"
+
+/* value types */
+#define OBJECT_TYPE_ATTR  "xmlrpc_type"
+#define OBJECT_VALUE_ATTR "scalar"
+#define OBJECT_VALUE_TS_ATTR "timestamp"
+
+/* faults */
+#define FAULT_CODE       "faultCode"
+#define FAULT_CODE_LEN   (sizeof(FAULT_CODE) - 1)
+#define FAULT_STRING     "faultString"
+#define FAULT_STRING_LEN (sizeof(FAULT_STRING) - 1)
+
+/***********************
+* forward declarations *
+***********************/
+XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(php_output_options* out, zval* value, zval** newvalue);
+static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data);
+int sset_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE type);
+zval* decode_request_worker(zval* xml_in, zval* encoding_in, zval* method_name_out);
+const char* xmlrpc_type_as_str(XMLRPC_VALUE_TYPE type, XMLRPC_VECTOR_TYPE vtype);
+XMLRPC_VALUE_TYPE xmlrpc_str_as_type(const char* str);
+XMLRPC_VECTOR_TYPE xmlrpc_str_as_vector_type(const char* str);
+int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE type);
+
+/*********************
+* startup / shutdown *
+*********************/
+
+static void destroy_server_data(xmlrpc_server_data *server)
+{
+       if (server) {
+               XMLRPC_ServerDestroy(server->server_ptr);
+
+               zval_dtor(server->method_map);
+               FREE_ZVAL(server->method_map);
+
+               zval_dtor(server->introspection_map);
+               FREE_ZVAL(server->introspection_map);
+
+               efree(server);
+       }
+}
+
+/* called when server is being destructed. either when xmlrpc_server_destroy
+ * is called, or when request ends.  */
+static void xmlrpc_server_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+       if (rsrc && rsrc->ptr) {
+               destroy_server_data((xmlrpc_server_data*) rsrc->ptr);
+       }
+}
+
+/* module init */
+PHP_MINIT_FUNCTION(xmlrpc)
+{
+       ZEND_INIT_MODULE_GLOBALS(xmlrpc, php_xmlrpc_init_globals, NULL);
+
+       REGISTER_INI_ENTRIES();
+
+       le_xmlrpc_server = zend_register_list_destructors_ex(xmlrpc_server_destructor, NULL, "xmlrpc server", module_number);
+
+       return SUCCESS;
+}
+
+/* module shutdown */
+PHP_MSHUTDOWN_FUNCTION(xmlrpc)
+{
+       return SUCCESS;
+}
+
+/* Remove if there's nothing to do at request start */
+PHP_RINIT_FUNCTION(xmlrpc)
+{
+       return SUCCESS;
+}
+
+/* Remove if there's nothing to do at request end */
+PHP_RSHUTDOWN_FUNCTION(xmlrpc)
+{
+       return SUCCESS;
+}
+
+/* display info in phpinfo() */
+PHP_MINFO_FUNCTION(xmlrpc)
+{
+       php_info_print_table_start();
+       php_info_print_table_row(2, "core library version", XMLRPC_GetVersionString());
+       php_info_print_table_row(2, "php extension version", PHP_EXT_VERSION);
+       php_info_print_table_row(2, "author", "Dan Libby");
+       php_info_print_table_row(2, "homepage", "http://xmlrpc-epi.sourceforge.net");
+       php_info_print_table_row(2, "open sourced by", "Epinions.com");
+       php_info_print_table_end();
+}
+
+/*******************
+* random utilities *
+*******************/
+
+/* Utility functions for adding data types to arrays, with or without key (assoc, non-assoc).
+ * Could easily be further generalized to work with objects.
+ */
+#if 0
+static int add_long(zval* list, char* id, int num) {
+       if(id) return add_assoc_long(list, id, num);
+       else   return add_next_index_long(list, num);
+}
+
+static int add_double(zval* list, char* id, double num) {
+       if(id) return add_assoc_double(list, id, num);
+       else   return add_next_index_double(list, num);
+}
+
+static int add_string(zval* list, char* id, char* string, int duplicate) {
+       if(id) return add_assoc_string(list, id, string, duplicate);
+       else   return add_next_index_string(list, string, duplicate);
+}
+
+static int add_stringl(zval* list, char* id, char* string, uint length, int duplicate) {
+       if(id) return add_assoc_stringl(list, id, string, length, duplicate);
+       else   return add_next_index_stringl(list, string, length, duplicate);
+}
+
+#endif
+
+static int add_zval(zval* list, const char* id, zval** val)
+{
+       if (list && val) {
+               if (id) {
+                       return zend_hash_update(Z_ARRVAL_P(list), (char*) id, strlen(id) + 1, (void *) val, sizeof(zval **), NULL);
+               } else {
+                       return zend_hash_next_index_insert(Z_ARRVAL_P(list), (void *) val, sizeof(zval **), NULL); 
+               }
+       }
+       /* what is the correct return on error? */
+       return 0;
+}
+
+#define my_zend_hash_get_current_key(ht, my_key, num_index) zend_hash_get_current_key(ht, my_key, num_index, 0)
+
+
+/*************************
+* input / output options *
+*************************/
+
+/* parse an array (user input) into output options suitable for use by xmlrpc engine
+ * and determine whether to return data as xml or php vars */
+static void set_output_options(php_output_options* options, zval* output_opts)
+{
+       XMLRPCLS_FETCH();
+
+       if (options) {
+
+               /* defaults */
+               options->b_php_out = 0;
+               options->b_auto_version = 1;
+               options->b_allow_null = 0;
+               options->xmlrpc_out.version = xmlrpc_version_1_0;
+               options->xmlrpc_out.xml_elem_opts.encoding = ENCODING_DEFAULT;
+               options->xmlrpc_out.xml_elem_opts.verbosity = xml_elem_pretty;
+               options->xmlrpc_out.xml_elem_opts.escaping = xml_elem_markup_escaping | xml_elem_non_ascii_escaping | xml_elem_non_print_escaping;
+
+               if (output_opts && Z_TYPE_P(output_opts) == IS_ARRAY) {
+                       zval** val;
+
+                       /* marshal NULL */
+                       if (zend_hash_find(Z_ARRVAL_P(output_opts), ALLOW_NULL_KEY, ALLOW_NULL_KEY_LEN + 1, (void**) &val) == SUCCESS) {
+                               if (Z_TYPE_PP(val) == IS_BOOL) {
+                                       if (Z_LVAL_PP(val)) {
+                                               options->b_allow_null = 1;
+                                       } else {
+                                               options->b_allow_null = 0;
+                                       }
+                               }
+                       }
+
+                       /* type of output (xml/php) */
+                       if (zend_hash_find(Z_ARRVAL_P(output_opts), OUTPUT_TYPE_KEY, OUTPUT_TYPE_KEY_LEN + 1, (void**) &val) == SUCCESS) {
+                               if (Z_TYPE_PP(val) == IS_STRING) {
+                                       if (!strcmp(Z_STRVAL_PP(val), OUTPUT_TYPE_VALUE_PHP)) {
+                                               options->b_php_out = 1;
+                                       } else if (!strcmp(Z_STRVAL_PP(val), OUTPUT_TYPE_VALUE_XML)) {
+                                               options->b_php_out = 0;
+                                       }
+                               }
+                       }
+
+                       /* verbosity of generated xml */
+                       if (zend_hash_find(Z_ARRVAL_P(output_opts), VERBOSITY_KEY, VERBOSITY_KEY_LEN + 1, (void**) &val) == SUCCESS) {
+                               if (Z_TYPE_PP(val) == IS_STRING) {
+                                       if (!strcmp(Z_STRVAL_PP(val), VERBOSITY_VALUE_NO_WHITE_SPACE)) {
+                                               options->xmlrpc_out.xml_elem_opts.verbosity = xml_elem_no_white_space;
+                                       } else if (!strcmp(Z_STRVAL_PP(val), VERBOSITY_VALUE_NEWLINES_ONLY)) {
+                                               options->xmlrpc_out.xml_elem_opts.verbosity = xml_elem_newlines_only;
+                                       } else if (!strcmp(Z_STRVAL_PP(val), VERBOSITY_VALUE_PRETTY)) {
+                                               options->xmlrpc_out.xml_elem_opts.verbosity = xml_elem_pretty;
+                                       }
+                               }
+                       }
+
+                       /* version of xml to output */
+                       if (zend_hash_find(Z_ARRVAL_P(output_opts), VERSION_KEY, VERSION_KEY_LEN + 1, (void**) &val) == SUCCESS) {
+                               if (Z_TYPE_PP(val) == IS_STRING) {
+                                       options->b_auto_version = 0;
+                                       if (!strcmp(Z_STRVAL_PP(val), VERSION_VALUE_XMLRPC)) {
+                                               options->xmlrpc_out.version = xmlrpc_version_1_0;
+                                       } else if (!strcmp(Z_STRVAL_PP(val), VERSION_VALUE_SIMPLE)) {
+                                               options->xmlrpc_out.version = xmlrpc_version_simple;
+                                       } else if (!strcmp((*val)->value.str.val, VERSION_VALUE_SOAP11)) {
+                                                       options->xmlrpc_out.version = xmlrpc_version_soap_1_1;
+                                       } else { /* if(!strcmp((*val)->value.str.val, VERSION_VALUE_AUTO)) { */
+                                                       options->b_auto_version = 1;
+                                       }
+                               }
+                       }
+
+                 /* encoding code set */
+                 if(zend_hash_find(Z_ARRVAL_P(output_opts), 
+                                   ENCODING_KEY, ENCODING_KEY_LEN + 1, 
+                                   (void**)&val) == SUCCESS) {
+                    if(Z_TYPE_PP(val) == IS_STRING) {
+                       options->xmlrpc_out.xml_elem_opts.encoding = estrdup(Z_STRVAL_PP(val));
+                    }
+                 }
+
+                 /* escaping options */
+                 if(zend_hash_find(Z_ARRVAL_P(output_opts), 
+                                   ESCAPING_KEY, ESCAPING_KEY_LEN + 1, 
+                                   (void**)&val) == SUCCESS) {
+                    /* multiple values allowed.  check if array */
+                    if(Z_TYPE_PP(val) == IS_ARRAY) {
+                       zval** iter_val;
+                       zend_hash_internal_pointer_reset(Z_ARRVAL_PP(val));
+                       options->xmlrpc_out.xml_elem_opts.escaping = xml_elem_no_escaping;
+                       while(1) {
+                          if(zend_hash_get_current_data(Z_ARRVAL_PP(val), (void**)&iter_val) == SUCCESS) {
+                             if(Z_TYPE_PP(iter_val) == IS_STRING && Z_STRVAL_PP(iter_val)) {
+                                if(!strcmp(Z_STRVAL_PP(iter_val), ESCAPING_VALUE_CDATA)) {
+                                   options->xmlrpc_out.xml_elem_opts.escaping |= xml_elem_cdata_escaping;
+                                }
+                                else if(!strcmp(Z_STRVAL_PP(iter_val), ESCAPING_VALUE_NON_ASCII)) {
+                                   options->xmlrpc_out.xml_elem_opts.escaping |= xml_elem_non_ascii_escaping;
+                                }
+                                else if(!strcmp(Z_STRVAL_PP(iter_val), ESCAPING_VALUE_NON_PRINT)) {
+                                   options->xmlrpc_out.xml_elem_opts.escaping |= xml_elem_non_print_escaping;
+                                }
+                                else if(!strcmp(Z_STRVAL_PP(iter_val), ESCAPING_VALUE_MARKUP)) {
+                                   options->xmlrpc_out.xml_elem_opts.escaping |= xml_elem_markup_escaping;
+                                }
+                             }
+                          }
+                          else {
+                             break;
+                          }
+
+                          zend_hash_move_forward(Z_ARRVAL_PP(val));
+                       }
+                    }
+                    /* else, check for single value */
+                    else if(Z_TYPE_PP(val) == IS_STRING) {
+                       if(!strcmp(Z_STRVAL_PP(val), ESCAPING_VALUE_CDATA)) {
+                          options->xmlrpc_out.xml_elem_opts.escaping = xml_elem_cdata_escaping;
+                       }
+                       else if(!strcmp(Z_STRVAL_PP(val), ESCAPING_VALUE_NON_ASCII)) {
+                          options->xmlrpc_out.xml_elem_opts.escaping = xml_elem_non_ascii_escaping;
+                       }
+                       else if(!strcmp(Z_STRVAL_PP(val), ESCAPING_VALUE_NON_PRINT)) {
+                          options->xmlrpc_out.xml_elem_opts.escaping = xml_elem_non_print_escaping;
+                       }
+                       else if(!strcmp(Z_STRVAL_PP(val), ESCAPING_VALUE_MARKUP)) {
+                          options->xmlrpc_out.xml_elem_opts.escaping = xml_elem_markup_escaping;
+                       }
+                    }
+                 }
+         }
+       }
+}
+
+
+/******************
+* encode / decode *
+******************/
+
+/* php arrays have no distinction between array and struct types.
+ * they even allow mixed.  Thus, we determine the type by iterating
+ * through the entire array and figuring out each element.
+ * room for some optimation here if we stop after a specific # of elements.
+ */
+static XMLRPC_VECTOR_TYPE determine_vector_type (HashTable *ht)
+{
+    int bArray = 0, bStruct = 0, bMixed = 0;
+    unsigned long num_index;
+    char* my_key;
+
+    zend_hash_internal_pointer_reset(ht);
+    while(1) {
+       int res = my_zend_hash_get_current_key(ht, &my_key, &num_index);
+       if(res == HASH_KEY_IS_LONG) {
+           if(bStruct) {
+               bMixed = 1;
+               break;
+           }
+           bArray = 1;
+       }
+       else if(res == HASH_KEY_NON_EXISTANT) {
+          break;
+       }
+       else if(res == HASH_KEY_IS_STRING) {
+           if(bArray) {
+               bMixed = 1;
+               break;
+           }
+           bStruct = 1;
+       }
+
+       zend_hash_move_forward(ht);
+    }
+    return bMixed ? xmlrpc_vector_mixed : (bStruct ? xmlrpc_vector_struct : xmlrpc_vector_array);
+}
+
+/* recursively convert php values into xmlrpc values */
+static XMLRPC_VALUE PHP_to_XMLRPC_worker (php_output_options* out, const char* key, zval* in_val, int depth)
+{
+   XMLRPC_VALUE xReturn = NULL;
+   if(in_val) {
+      zval* val = NULL;
+      XMLRPC_VALUE_TYPE type = get_zval_xmlrpc_type(out, in_val, &val);
+      if(val) {
+         switch(type) {
+            case xmlrpc_nil:
+               xReturn = XMLRPC_CreateValueEmpty();
+               XMLRPC_SetValueID(xReturn, key, 0);
+               break;
+            case xmlrpc_base64:
+               xReturn = XMLRPC_CreateValueBase64(key, Z_STRVAL_P(val), Z_STRLEN_P(val));
+               break;
+            case xmlrpc_datetime:
+               convert_to_string(val);
+               xReturn = XMLRPC_CreateValueDateTime_ISO8601(key, Z_STRVAL_P(val));
+               break;
+            case xmlrpc_boolean:
+               convert_to_boolean(val);
+               xReturn = XMLRPC_CreateValueBoolean(key, Z_LVAL_P(val));
+               break;
+            case xmlrpc_int:
+               convert_to_long(val);
+               xReturn = XMLRPC_CreateValueInt(key, Z_LVAL_P(val));
+               break;
+            case xmlrpc_double:
+               convert_to_double(val);
+               xReturn = XMLRPC_CreateValueDouble(key, Z_DVAL_P(val));
+               break;
+            case xmlrpc_string:
+               convert_to_string(val);
+               xReturn = XMLRPC_CreateValueString(key, Z_STRVAL_P(val), Z_STRLEN_P(val));
+               break;
+            case xmlrpc_vector:
+               {
+                  unsigned long num_index;
+                  zval** pIter;
+                  char* my_key;
+
+                  convert_to_array(val);
+
+                  xReturn = XMLRPC_CreateVector(key, determine_vector_type(Z_ARRVAL_P(val)));
+
+                  zend_hash_internal_pointer_reset(Z_ARRVAL_P(val));
+                  while(1) {
+                     int res = my_zend_hash_get_current_key(Z_ARRVAL_P(val), &my_key, &num_index);
+                     if(res == HASH_KEY_IS_LONG) {
+                        if(zend_hash_get_current_data(Z_ARRVAL_P(val), (void**)&pIter) == SUCCESS) {
+                           XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(out, 0, *pIter, depth++));
+                        }
+                     }
+                     else if(res == HASH_KEY_NON_EXISTANT) {
+                        break;
+                     }
+                     else if(res == HASH_KEY_IS_STRING) {
+                        if(zend_hash_get_current_data(Z_ARRVAL_P(val), (void**)&pIter) == SUCCESS) {
+                           XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(out, my_key, *pIter, depth++));
+                        }
+                     }
+
+                     zend_hash_move_forward(Z_ARRVAL_P(val));
+                  }
+               }
+               break;
+            default:
+               break;
+         }
+      }
+   }
+   return xReturn;
+}
+
+static XMLRPC_VALUE PHP_to_XMLRPC(php_output_options* out, zval* root_val)
+{
+   return PHP_to_XMLRPC_worker(out, NULL, root_val, 0);
+}
+
+/* recursively convert xmlrpc values into php values */
+static zval* XMLRPC_to_PHP(XMLRPC_VALUE el)
+{
+   zval* elem = NULL;
+   const char* pStr;
+
+   if(el) {
+      XMLRPC_VALUE_TYPE type = XMLRPC_GetValueType(el);
+
+      MAKE_STD_ZVAL(elem); /* init. very important.  spent a frustrating day finding this out. */
+
+      switch(type) {
+         case xmlrpc_empty:
+         case xmlrpc_nil:
+            Z_TYPE_P(elem) = IS_NULL;
+            break;
+         case xmlrpc_string:
+            pStr = XMLRPC_GetValueString(el);
+            if(pStr) {
+               Z_STRLEN_P(elem) = XMLRPC_GetValueStringLen(el);
+               Z_STRVAL_P(elem) = estrndup(pStr, Z_STRLEN_P(elem));
+               Z_TYPE_P(elem) = IS_STRING;
+            }
+            break;
+         case xmlrpc_int:
+            Z_LVAL_P(elem) = XMLRPC_GetValueInt(el);
+            Z_TYPE_P(elem) = IS_LONG;
+            break;
+         case xmlrpc_boolean:
+            Z_LVAL_P(elem) = XMLRPC_GetValueBoolean(el);
+            Z_TYPE_P(elem) = IS_BOOL;
+            break;
+         case xmlrpc_double:
+            Z_DVAL_P(elem) = XMLRPC_GetValueDouble(el);
+            Z_TYPE_P(elem) = IS_DOUBLE;
+            break;
+         case xmlrpc_datetime:
+            Z_STRLEN_P(elem) = XMLRPC_GetValueStringLen(el);
+            Z_STRVAL_P(elem) = estrndup(XMLRPC_GetValueDateTime_ISO8601(el), Z_STRLEN_P(elem));
+            Z_TYPE_P(elem) = IS_STRING;
+            break;
+         case xmlrpc_base64:
+            pStr = XMLRPC_GetValueBase64(el);
+            if(pStr) {
+               Z_STRLEN_P(elem) = XMLRPC_GetValueStringLen(el);
+               Z_STRVAL_P(elem) = estrndup(pStr, Z_STRLEN_P(elem));
+               Z_TYPE_P(elem) = IS_STRING;
+            }
+            break;
+         case xmlrpc_vector:
+               array_init(elem);
+               {
+                       XMLRPC_VALUE xIter = XMLRPC_VectorRewind(el);
+
+                       while( xIter ) {
+                               zval *val = XMLRPC_to_PHP(xIter);
+                               if (val) {
+                                       add_zval(elem, XMLRPC_GetValueID(xIter), &val);
+                               }
+                               xIter = XMLRPC_VectorNext(el);
+                       }
+               }
+               break;
+         default:
+            break;
+      }
+      set_zval_xmlrpc_type(elem, type);
+   }
+   return elem;
+}
+
+/* {{{ proto string xmlrpc_encode_request(string method, mixed params)
+   Generates XML for a method request */
+PHP_FUNCTION(xmlrpc_encode_request)
+{
+       XMLRPC_REQUEST xRequest = NULL;
+       zval **method, **vals, **out_opts;
+       char* outBuf;
+       php_output_options out;
+
+       if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 || (zend_get_parameters_ex(ZEND_NUM_ARGS(), &method, &vals, &out_opts) == FAILURE)) {
+               WRONG_PARAM_COUNT; /* prints/logs a warning and returns */
+       }
+
+       set_output_options(&out, (ZEND_NUM_ARGS() == 3) ? *out_opts : 0);
+
+       if(return_value_used) {
+               xRequest = XMLRPC_RequestNew();
+
+               if(xRequest) {
+                       XMLRPC_RequestSetOutputOptions(xRequest, &out.xmlrpc_out);
+                       if (Z_TYPE_PP(method) == IS_NULL) {
+                               XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_response);
+                       } else {
+                               XMLRPC_RequestSetMethodName(xRequest, Z_STRVAL_PP(method));
+                               XMLRPC_RequestSetRequestType(xRequest, xmlrpc_request_call);
+                       }
+                       if (Z_TYPE_PP(vals) != IS_NULL) {
+                               XMLRPC_RequestSetData(xRequest, PHP_to_XMLRPC(&out, *vals));
+                       }
+
+                       outBuf = XMLRPC_REQUEST_ToXML(xRequest, 0);
+                       if(outBuf) {
+                               RETVAL_STRING(outBuf, 1);
+                               free(outBuf);
+                       }
+                       XMLRPC_RequestFree(xRequest, 1);
+               }
+       }
+}
+/* }}} */
+
+/* {{{ proto string xmlrpc_encode(mixed value)
+   Generates XML for a PHP value */
+PHP_FUNCTION(xmlrpc_encode)
+{
+       XMLRPC_VALUE xOut = NULL;
+       zval **arg1;
+       char *outBuf;
+
+       if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, &arg1) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       if( return_value_used ) {
+               /* convert native php type to xmlrpc type */
+               xOut = PHP_to_XMLRPC(NULL, *arg1);
+
+               /* generate raw xml from xmlrpc data */
+               outBuf = XMLRPC_VALUE_ToXML(xOut, 0);
+
+               if(xOut) {
+                       if(outBuf) {
+                               RETVAL_STRING(outBuf, 1);
+                               free(outBuf);
+                       }
+                       /* cleanup */
+                       XMLRPC_CleanupValue(xOut);
+               }
+       }
+}
+/* }}} */
+
+
+zval* decode_request_worker (zval* xml_in, zval* encoding_in, zval* method_name_out)
+{
+   zval* retval = NULL;
+   XMLRPC_REQUEST response;
+   STRUCT_XMLRPC_REQUEST_INPUT_OPTIONS opts = {{0}};
+   opts.xml_elem_opts.encoding = encoding_in ? utf8_get_encoding_id_from_string(Z_STRVAL_P(encoding_in)) : ENCODING_DEFAULT;
+
+   /* generate XMLRPC_REQUEST from raw xml */
+   response = XMLRPC_REQUEST_FromXML(Z_STRVAL_P(xml_in), Z_STRLEN_P(xml_in), &opts);
+   if(response) {
+      /* convert xmlrpc data to native php types */
+      retval = XMLRPC_to_PHP(XMLRPC_RequestGetData(response));
+
+      if(XMLRPC_RequestGetRequestType(response) == xmlrpc_request_call) {
+         if(method_name_out) {
+            convert_to_string(method_name_out);
+            Z_TYPE_P(method_name_out) = IS_STRING;
+            Z_STRVAL_P(method_name_out) = estrdup(XMLRPC_RequestGetMethodName(response));
+            Z_STRLEN_P(method_name_out) = strlen(Z_STRVAL_P(method_name_out));
+         }
+      }
+
+      /* dust, sweep, and mop */
+      XMLRPC_RequestFree(response, 1);
+   }
+   return retval;
+}
+
+/* {{{ proto array xmlrpc_decode_request(string xml, string& method [, string encoding])
+   Decodes XML into native PHP types */
+PHP_FUNCTION(xmlrpc_decode_request)
+{
+       zval **xml, **method, **encoding = NULL;
+       int argc = ZEND_NUM_ARGS();
+
+       if (argc < 2 || argc > 3 || (zend_get_parameters_ex(argc, &xml, &method, &encoding) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       convert_to_string_ex(xml);
+       convert_to_string_ex(method);
+       if(argc == 3) {
+               convert_to_string_ex(encoding);
+       }
+
+       if(return_value_used) {
+               zval* retval = decode_request_worker(*xml, encoding ? *encoding : NULL, *method);
+               if(retval) {
+                       *return_value = *retval;
+                       FREE_ZVAL(retval);
+               }
+       }
+}
+/* }}} */
+
+
+/* {{{ proto array xmlrpc_decode(string xml [, string encoding])
+   Decodes XML into native PHP types */
+PHP_FUNCTION(xmlrpc_decode)
+{
+       zval **arg1, **arg2 = NULL;
+       int argc = ZEND_NUM_ARGS();
+
+       if (argc < 1 || argc > 2 || (zend_get_parameters_ex(argc, &arg1, &arg2) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       convert_to_string_ex(arg1);
+       if(argc == 2) {
+               convert_to_string_ex(arg2);
+       }
+
+       if(return_value_used) {
+               zval* retval = decode_request_worker(*arg1, arg2 ? *arg2 : NULL, NULL);
+               if(retval) {
+                       *return_value = *retval;
+                       FREE_ZVAL(retval);
+               }
+       }
+}
+/* }}} */
+
+
+/*************************
+* server related methods *
+*************************/
+
+/* {{{ proto resource xmlrpc_server_create(void)
+   Creates an xmlrpc server */
+PHP_FUNCTION(xmlrpc_server_create)
+{
+       if(ZEND_NUM_ARGS() != 0) {
+               WRONG_PARAM_COUNT;
+       }
+
+       if(return_value_used) {
+               zval *method_map, *introspection_map;
+               xmlrpc_server_data *server = emalloc(sizeof(xmlrpc_server_data));
+               MAKE_STD_ZVAL(method_map);
+               MAKE_STD_ZVAL(introspection_map);
+               
+               array_init(method_map);
+               array_init(introspection_map);
+               
+               /* allocate server data.  free'd in destroy_server_data() */
+               server->method_map = method_map;
+               server->introspection_map = introspection_map;
+               server->server_ptr = XMLRPC_ServerCreate();
+
+               XMLRPC_ServerRegisterIntrospectionCallback(server->server_ptr, php_xmlrpc_introspection_callback);
+
+               /* store for later use */
+               ZEND_REGISTER_RESOURCE(return_value,server, le_xmlrpc_server);
+       }
+}
+/* }}} */
+
+/* {{{ proto int xmlrpc_server_destroy(resource server)
+   Destroys server resources */
+PHP_FUNCTION(xmlrpc_server_destroy)
+{
+       zval **arg1;
+       int bSuccess = FAILURE;
+
+       if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, &arg1) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       if(Z_TYPE_PP(arg1) == IS_RESOURCE) {
+               int type;
+
+               xmlrpc_server_data *server = zend_list_find(Z_LVAL_PP(arg1), &type);
+
+               if(server && type == le_xmlrpc_server) {
+                       bSuccess = zend_list_delete(Z_LVAL_PP(arg1));
+
+                       /* called by hashtable destructor
+                        * destroy_server_data(server);
+                        */
+               }
+       }
+       RETVAL_LONG(bSuccess == SUCCESS);
+}
+/* }}} */
+
+           
+/* called by xmlrpc C engine as method handler for all registered methods.
+ * it then calls the corresponding PHP function to handle the method.
+ */
+static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST xRequest, void* data)
+{
+   xmlrpc_callback_data* pData = (xmlrpc_callback_data*)data;
+   zval* xmlrpc_params;
+   zval* callback_params[3];
+   TSRMLS_FETCH();
+   
+   /* convert xmlrpc to native php types */
+   xmlrpc_params = XMLRPC_to_PHP(XMLRPC_RequestGetData(xRequest));
+
+   /* setup data hoojum */
+   callback_params[0] = pData->xmlrpc_method;
+   callback_params[1] = xmlrpc_params;
+   callback_params[2] = pData->caller_params;
+
+   /* Use same C function for all methods */
+
+   /* php func prototype: function user_func($method_name, $xmlrpc_params, $user_params) */
+   call_user_function(CG(function_table), NULL, pData->php_function, pData->return_data, 3, callback_params TSRMLS_CC);
+
+   pData->php_executed = 1;
+
+       zval_dtor(xmlrpc_params);
+       FREE_ZVAL(xmlrpc_params);
+
+       return NULL;
+}
+
+/* called by the C server when it first receives an introspection request.  We pass this on to
+ * our PHP listeners, if any
+ */
+static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
+{
+   zval *retval_ptr, **php_function;
+   zval* callback_params[1];
+   xmlrpc_callback_data* pData = (xmlrpc_callback_data*)data;
+   TSRMLS_FETCH();
+   
+   MAKE_STD_ZVAL(retval_ptr);
+   Z_TYPE_P(retval_ptr) = IS_NULL;
+
+   /* setup data hoojum */
+   callback_params[0] = pData->caller_params;
+
+   /* loop through and call all registered callbacks */
+   zend_hash_internal_pointer_reset(Z_ARRVAL_P(pData->server->introspection_map));
+   while(1) {
+      if(zend_hash_get_current_data(Z_ARRVAL_P(pData->server->introspection_map), 
+                                    (void**)&php_function) == SUCCESS) {
+
+         /* php func prototype: function string user_func($user_params) */
+         if(call_user_function(CG(function_table), NULL, *php_function, 
+                               retval_ptr, 1, callback_params TSRMLS_CC) == SUCCESS) {
+            XMLRPC_VALUE xData;
+            STRUCT_XMLRPC_ERROR err = {0};
+
+            /* return value should be a string */
+            convert_to_string(retval_ptr);
+
+            xData = XMLRPC_IntrospectionCreateDescription(Z_STRVAL_P(retval_ptr), &err);
+
+            if(xData) {
+               if(!XMLRPC_ServerAddIntrospectionData(server, xData)) {
+                  php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s(), improper element structure", Z_STRVAL_PP(php_function));
+               }
+               XMLRPC_CleanupValue(xData);
+            }
+            else {
+               /* could not create description */
+               if(err.xml_elem_error.parser_code) {
+                  php_error_docref(NULL TSRMLS_CC, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to add introspection data returned from %s()", 
+                             err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error, Z_STRVAL_PP(php_function));
+               }
+               else {
+                  php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to add introspection data returned from %s()", 
+                             Z_STRVAL_PP(php_function));
+               }
+            }
+         }
+         else {
+            /* user func failed */
+            php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error calling user introspection callback: %s()", Z_STRVAL_PP(php_function));
+         }
+      }
+      else {
+         break;
+      }
+
+      zend_hash_move_forward(Z_ARRVAL_P(pData->server->introspection_map));
+   }
+
+   /* so we don't call the same callbacks ever again */
+   zend_hash_clean(Z_ARRVAL_P(pData->server->introspection_map));
+}
+
+/* {{{ proto bool xmlrpc_server_register_method(resource server, string method_name, string function)
+   Register a PHP function to handle method matching method_name */
+PHP_FUNCTION(xmlrpc_server_register_method)
+{
+       zval **method_key, **method_name, **handle, *method_name_save;
+       int type;
+       xmlrpc_server_data* server;
+
+       if (ZEND_NUM_ARGS() != 3 || (zend_get_parameters_ex(3, &handle, &method_key, &method_name) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       server = zend_list_find(Z_LVAL_PP(handle), &type);
+
+       if(type == le_xmlrpc_server) {
+               /* register with C engine. every method just calls our standard callback, 
+                * and it then dispatches to php as necessary
+                */
+               if(XMLRPC_ServerRegisterMethod(server->server_ptr, Z_STRVAL_PP(method_key), php_xmlrpc_callback)) {
+                       /* save for later use */
+                       MAKE_STD_ZVAL(method_name_save);
+                       *method_name_save = **method_name;
+                       zval_copy_ctor(method_name_save);
+
+                       /* register our php method */
+                       add_zval(server->method_map, Z_STRVAL_PP(method_key), &method_name_save);
+
+                       RETURN_BOOL(1);
+               }
+       }
+       RETURN_BOOL(0);
+}
+/* }}} */
+
+
+/* {{{ proto bool xmlrpc_server_register_introspection_callback(resource server, string function)
+   Register a PHP function to generate documentation */
+PHP_FUNCTION(xmlrpc_server_register_introspection_callback)
+{
+       zval **method_name, **handle, *method_name_save;
+       int type;
+       xmlrpc_server_data* server;
+
+       if (ZEND_NUM_ARGS() != 2 || (zend_get_parameters_ex(2, &handle, &method_name) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       server = zend_list_find(Z_LVAL_PP(handle), &type);
+
+       if(type == le_xmlrpc_server) {
+               /* save for later use */
+               MAKE_STD_ZVAL(method_name_save);
+               *method_name_save = **method_name;
+               zval_copy_ctor(method_name_save);
+
+               /* register our php method */
+               add_zval(server->introspection_map, NULL, &method_name_save);
+
+               RETURN_BOOL(1);
+       }
+       RETURN_BOOL(0);
+}
+/* }}} */
+
+
+/* this function is itchin for a re-write */
+
+/* {{{ proto mixed xmlrpc_server_call_method(resource server, string xml, mixed user_data [, array output_options])
+   Parses XML requests and call methods */
+PHP_FUNCTION(xmlrpc_server_call_method)
+{
+       xmlrpc_callback_data data = {0};
+       XMLRPC_REQUEST xRequest;
+       STRUCT_XMLRPC_REQUEST_INPUT_OPTIONS input_opts;
+       xmlrpc_server_data* server;
+       zval **rawxml, **caller_params, **handle, **output_opts = NULL;
+       int type;
+       php_output_options out;
+       int argc =ZEND_NUM_ARGS();
+       
+       if (argc < 3 || argc > 4 || (zend_get_parameters_ex(argc, &handle, &rawxml, &caller_params, &output_opts) != SUCCESS)) {
+               WRONG_PARAM_COUNT;
+       }
+       /* user output options */
+       if (argc == 3) {
+               set_output_options(&out, NULL);
+       }
+       else {
+               set_output_options(&out, *output_opts);
+       }
+
+       server = zend_list_find(Z_LVAL_PP(handle), &type);
+
+       if(type == le_xmlrpc_server) {
+               /* HACK: use output encoding for now */
+               input_opts.xml_elem_opts.encoding = utf8_get_encoding_id_from_string(out.xmlrpc_out.xml_elem_opts.encoding);
+
+               /* generate an XMLRPC_REQUEST from the raw xml input */
+               xRequest = XMLRPC_REQUEST_FromXML(Z_STRVAL_PP(rawxml), Z_STRLEN_PP(rawxml), &input_opts);
+
+               if(xRequest) {
+                       const char* methodname = XMLRPC_RequestGetMethodName(xRequest);
+                       zval **php_function;
+                       XMLRPC_VALUE xAnswer = NULL;
+                       MAKE_STD_ZVAL(data.xmlrpc_method); /* init. very important.  spent a frustrating day finding this out. */
+                       MAKE_STD_ZVAL(data.return_data);
+                       Z_TYPE_P(data.return_data) = IS_NULL;  /* in case value is never init'd, we don't dtor to think it is a string or something */
+                       Z_TYPE_P(data.xmlrpc_method) = IS_NULL;
+
+                       if (!methodname) {
+                               methodname = "";
+                       }
+            
+                       /* setup some data to pass to the callback function */
+                       Z_STRVAL_P(data.xmlrpc_method) = estrdup(methodname);
+                       Z_STRLEN_P(data.xmlrpc_method) = strlen(methodname);
+                       Z_TYPE_P(data.xmlrpc_method) = IS_STRING;
+                       data.caller_params = *caller_params;
+                       data.php_executed = 0;
+                       data.server = server;
+
+                       /* check if the called method has been previous registered */
+                       if(zend_hash_find(Z_ARRVAL_P(server->method_map),
+                              Z_STRVAL_P(data.xmlrpc_method), 
+                              Z_STRLEN_P(data.xmlrpc_method) + 1, 
+                              (void**)&php_function) == SUCCESS) {
+
+                               data.php_function = *php_function;
+                       }
+
+                       /* We could just call the php method directly ourselves at this point, but we do this 
+                        * with a C callback in case the xmlrpc library ever implements some cool usage stats,
+                        * or somesuch.
+                        */
+                       xAnswer = XMLRPC_ServerCallMethod(server->server_ptr, xRequest, &data);
+                       if(xAnswer && out.b_php_out) {
+                               zval_dtor(data.return_data);
+                               FREE_ZVAL(data.return_data);
+                               data.return_data = XMLRPC_to_PHP(xAnswer);
+                       } else if(data.php_executed && !out.b_php_out) {
+                               xAnswer = PHP_to_XMLRPC(&out, data.return_data);
+                       }
+
+                       /* should we return data as xml? */
+                       if(!out.b_php_out) {
+                               XMLRPC_REQUEST xResponse = XMLRPC_RequestNew();
+                               if(xResponse) {
+                                       char *outBuf = 0;
+                                       int buf_len = 0;
+
+                                       /* automagically determine output serialization type from request type */
+                                       if (out.b_auto_version) { 
+                                               XMLRPC_REQUEST_OUTPUT_OPTIONS opts = XMLRPC_RequestGetOutputOptions(xRequest);
+                                               if (opts) {
+                                                       out.xmlrpc_out.version = opts->version;
+                                               }
+                                       }
+                                       /* set some required request hoojum */
+                                       XMLRPC_RequestSetOutputOptions(xResponse, &out.xmlrpc_out);
+                                       XMLRPC_RequestSetRequestType(xResponse, xmlrpc_request_response);
+                                       XMLRPC_RequestSetData(xResponse, xAnswer);
+                                       XMLRPC_RequestSetMethodName(xResponse, methodname);
+
+                                       /* generate xml */
+                                       outBuf = XMLRPC_REQUEST_ToXML(xResponse, &buf_len);
+                                       if(outBuf) {
+                                               RETVAL_STRINGL(outBuf, buf_len, 1);
+                                               free(outBuf);
+                                       }
+                                       /* cleanup after ourselves.  what a sty! */
+                                       XMLRPC_RequestFree(xResponse, 0);
+                               }
+                       } else { /* or as native php types? */
+                               *return_value = *data.return_data;
+                               zval_copy_ctor(return_value);
+                       }
+
+                       /* cleanup after ourselves.  what a sty! */
+                       zval_dtor(data.xmlrpc_method);
+                       FREE_ZVAL(data.xmlrpc_method);
+                       zval_dtor(data.return_data);
+                       FREE_ZVAL(data.return_data);
+
+                       if(xAnswer) {
+                               XMLRPC_CleanupValue(xAnswer);
+                       }
+
+                       XMLRPC_RequestFree(xRequest, 1);
+               }
+       }
+}
+/* }}} */
+
+
+/* {{{ proto int xmlrpc_server_add_introspection_data(resource server, array desc)
+   Adds introspection documentation  */
+PHP_FUNCTION(xmlrpc_server_add_introspection_data)
+{
+       zval **handle, **desc;
+       int type;
+       xmlrpc_server_data* server;
+
+       if (ZEND_NUM_ARGS() != 2 || (zend_get_parameters_ex(2, &handle, &desc) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       server = zend_list_find(Z_LVAL_PP(handle), &type);
+
+       if (type == le_xmlrpc_server) {
+               XMLRPC_VALUE xDesc = PHP_to_XMLRPC(NULL, *desc);
+               if (xDesc) {
+                       int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc);
+                       XMLRPC_CleanupValue(xDesc);
+                       RETURN_LONG(retval);
+               }
+       }
+       RETURN_LONG(0);
+}
+/* }}} */
+
+
+/* {{{ proto array xmlrpc_parse_method_descriptions(string xml)
+   Decodes XML into a list of method descriptions */
+PHP_FUNCTION(xmlrpc_parse_method_descriptions)
+{
+       zval **arg1, *retval;
+
+       if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, &arg1) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       convert_to_string_ex(arg1);
+
+       if(return_value_used) {
+               STRUCT_XMLRPC_ERROR err = {0};
+               XMLRPC_VALUE xVal = XMLRPC_IntrospectionCreateDescription(Z_STRVAL_PP(arg1), &err);
+               if(xVal) {
+                       retval = XMLRPC_to_PHP(xVal);
+
+                       if(retval) {
+                               *return_value = *retval;
+                               zval_copy_ctor(return_value);
+                       }
+                       /* dust, sweep, and mop */
+                       XMLRPC_CleanupValue(xVal);
+               } else {
+                       /* could not create description */
+                       if(err.xml_elem_error.parser_code) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to create introspection data", 
+                               err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid xml structure. Unable to create introspection data");
+                       }
+
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "xml parse error. no method description created");
+               }
+       }
+}
+/* }}} */
+
+
+/************
+* type data *
+************/
+
+#define XMLRPC_TYPE_COUNT 10
+#define XMLRPC_VECTOR_TYPE_COUNT 4
+#define TYPE_STR_MAP_SIZE (XMLRPC_TYPE_COUNT + XMLRPC_VECTOR_TYPE_COUNT)
+
+/* return a string matching a given xmlrpc type */
+static const char** get_type_str_mapping(void)
+{
+   static const char* str_mapping[TYPE_STR_MAP_SIZE];
+   static int first = 1;
+   if (first) {
+      /* warning. do not add/delete without changing size define */
+      str_mapping[xmlrpc_none]     = "none";
+      str_mapping[xmlrpc_empty]    = "empty";
+      str_mapping[xmlrpc_nil]      = "nil";
+      str_mapping[xmlrpc_base64]   = "base64";
+      str_mapping[xmlrpc_boolean]  = "boolean";
+      str_mapping[xmlrpc_datetime] = "datetime";
+      str_mapping[xmlrpc_double]   = "double";
+      str_mapping[xmlrpc_int]      = "int";
+      str_mapping[xmlrpc_string]   = "string";
+      str_mapping[xmlrpc_vector]   = "vector";
+      str_mapping[XMLRPC_TYPE_COUNT + xmlrpc_vector_none]   = "none";
+      str_mapping[XMLRPC_TYPE_COUNT + xmlrpc_vector_array]  = "array";
+      str_mapping[XMLRPC_TYPE_COUNT + xmlrpc_vector_mixed]  = "mixed";
+      str_mapping[XMLRPC_TYPE_COUNT + xmlrpc_vector_struct] = "struct";
+      first = 0;
+   }
+   return (const char**)str_mapping;
+}
+
+/* map an xmlrpc type to a string */
+const char* xmlrpc_type_as_str(XMLRPC_VALUE_TYPE type, XMLRPC_VECTOR_TYPE vtype)
+{
+   const char** str_mapping = get_type_str_mapping();
+
+   if (vtype == xmlrpc_vector_none) {
+      return str_mapping[type];
+   } else {
+      return str_mapping[XMLRPC_TYPE_COUNT + vtype];
+   }
+}
+
+/* map a string to an xmlrpc type */
+XMLRPC_VALUE_TYPE xmlrpc_str_as_type(const char* str)
+{
+   const char** str_mapping = get_type_str_mapping();
+   int i;
+
+   if (str) {
+      for (i = 0; i < XMLRPC_TYPE_COUNT; i++) {
+         if (!strcmp(str_mapping[i], str)) {
+            return (XMLRPC_VALUE_TYPE) i;
+         }
+      }
+   }
+   return xmlrpc_none;
+}
+
+/* map a string to an xmlrpc vector type */
+XMLRPC_VECTOR_TYPE xmlrpc_str_as_vector_type(const char* str)
+{
+   const char** str_mapping = get_type_str_mapping();
+   int i;
+
+   if (str) {
+      for (i = XMLRPC_TYPE_COUNT; i < TYPE_STR_MAP_SIZE; i++) {
+         if (!strcmp(str_mapping[i], str)) {
+            return (XMLRPC_VECTOR_TYPE) (i - XMLRPC_TYPE_COUNT);
+         }
+      }
+   }
+   return xmlrpc_none;
+}
+
+
+/* set a given value to a particular type. 
+ * note: this only works on strings, and only for date and base64,
+ *       which do not have native php types. black magic lies herein.
+ */
+int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype)
+{
+   int bSuccess = FAILURE;
+   TSRMLS_FETCH();
+
+   /* we only really care about strings because they can represent
+    * base64 and datetime.  all other types have corresponding php types
+    */
+   if (Z_TYPE_P(value) == IS_STRING) {
+      if (newtype == xmlrpc_base64 || newtype == xmlrpc_datetime) {
+         const char* typestr = xmlrpc_type_as_str(newtype, xmlrpc_vector_none);
+         zval* type;
+
+         MAKE_STD_ZVAL(type);
+
+         Z_TYPE_P(type) = IS_STRING;
+         Z_STRVAL_P(type) = estrdup(typestr);
+         Z_STRLEN_P(type) = strlen(typestr);
+
+         if(newtype == xmlrpc_datetime) {
+            XMLRPC_VALUE v = XMLRPC_CreateValueDateTime_ISO8601(NULL, value->value.str.val);
+            if(v) {
+               time_t timestamp = XMLRPC_GetValueDateTime(v);
+               if(timestamp) {
+                  pval* ztimestamp;
+
+                  MAKE_STD_ZVAL(ztimestamp);
+
+                  ztimestamp->type = IS_LONG;
+                  ztimestamp->value.lval = timestamp;
+
+                  convert_to_object(value);
+                  if(SUCCESS == zend_hash_update(Z_OBJPROP_P(value), OBJECT_TYPE_ATTR, sizeof(OBJECT_TYPE_ATTR), (void *) &type, sizeof(zval *), NULL)) {
+                     bSuccess = zend_hash_update(Z_OBJPROP_P(value), OBJECT_VALUE_TS_ATTR, sizeof(OBJECT_VALUE_TS_ATTR), (void *) &ztimestamp, sizeof(zval *), NULL);
+                  }
+               }
+               XMLRPC_CleanupValue(v);
+            }
+         }
+         else {
+            convert_to_object(value);
+            bSuccess = zend_hash_update(Z_OBJPROP_P(value), OBJECT_TYPE_ATTR, sizeof(OBJECT_TYPE_ATTR), (void *) &type, sizeof(zval *), NULL);
+         }
+      }
+   }
+   
+   return bSuccess;
+}
+
+/* return xmlrpc type of a php value */
+XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(php_output_options* out, zval* value, zval** newvalue)
+{
+   XMLRPC_VALUE_TYPE type = xmlrpc_none;
+   TSRMLS_FETCH();
+   XMLRPCLS_FETCH();
+
+   if (value) {
+      switch (Z_TYPE_P(value)) {
+         case IS_NULL:
+            if (XMLRPCG(allow_null) || (out && out->b_allow_null)) {
+               type = xmlrpc_nil;
+            } else {
+               type = xmlrpc_string;
+            }
+            break;
+#ifndef BOOL_AS_LONG
+
+   /* Right thing to do, but it breaks some legacy code. */
+         case IS_BOOL:
+            type = xmlrpc_boolean;
+            break;
+#else
+         case IS_BOOL:
+#endif
+         case IS_LONG:
+         case IS_RESOURCE:
+            type = xmlrpc_int;
+            break;
+         case IS_DOUBLE:
+            type = xmlrpc_double;
+            break;
+         case IS_CONSTANT:
+            type = xmlrpc_string;
+            break;
+         case IS_STRING:
+            type = xmlrpc_string;
+            break;
+         case IS_ARRAY:
+         case IS_CONSTANT_ARRAY:
+            type = xmlrpc_vector;
+            break;
+         case IS_OBJECT:
+         {
+            zval** attr;
+            type = xmlrpc_vector;
+
+            if (zend_hash_find(Z_OBJPROP_P(value), OBJECT_TYPE_ATTR, sizeof(OBJECT_TYPE_ATTR), (void**) &attr) == SUCCESS) {
+               if (Z_TYPE_PP(attr) == IS_STRING) {
+                  type = xmlrpc_str_as_type(Z_STRVAL_PP(attr));
+               }
+            }
+            break;
+         }
+      }
+
+               /* if requested, return an unmolested (magic removed) copy of the value */
+               if (newvalue) {
+                       zval** val;
+
+                       if ((type == xmlrpc_base64 && Z_TYPE_P(value) != IS_NULL) || type == xmlrpc_datetime) {
+                               if (zend_hash_find(Z_OBJPROP_P(value), OBJECT_VALUE_ATTR, sizeof(OBJECT_VALUE_ATTR), (void**) &val) == SUCCESS) {
+                                       *newvalue = *val;
+                               }
+                       } else {
+                               *newvalue = value;
+                       }
+               }
+       }
+
+       return type;
+}
+
+
+/* {{{ proto bool xmlrpc_set_type(string value, string type)
+   Sets xmlrpc type, base64 or datetime or nil, for a PHP string value */
+PHP_FUNCTION(xmlrpc_set_type)
+{
+       zval **arg, **type;
+       XMLRPC_VALUE_TYPE vtype;
+
+       if (ZEND_NUM_ARGS() != 2 || (zend_get_parameters_ex(2, &arg, &type) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       convert_to_string_ex(type);
+       vtype = xmlrpc_str_as_type(Z_STRVAL_PP(type));
+       if (vtype != xmlrpc_none) {
+               if (set_zval_xmlrpc_type(*arg, vtype) == SUCCESS) {
+                       RETURN_TRUE;
+               }
+       } else {
+               zend_error(E_WARNING,"invalid type '%s' passed to xmlrpc_set_type()", Z_STRVAL_PP(type));
+       }
+       RETURN_FALSE;
+}
+/* }}} */
+
+/* {{{ proto string xmlrpc_get_type(mixed value)
+   Gets xmlrpc type for a PHP value. Especially useful for base64 and datetime strings */
+PHP_FUNCTION(xmlrpc_get_type)
+{
+       zval **arg;
+       XMLRPC_VALUE_TYPE type;
+       XMLRPC_VECTOR_TYPE vtype = xmlrpc_vector_none;
+
+       if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, &arg) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       type = get_zval_xmlrpc_type(NULL, *arg, 0);
+       if (type == xmlrpc_vector) {
+               vtype = determine_vector_type(Z_ARRVAL_PP(arg));
+       }
+   
+       RETURN_STRING((char*) xmlrpc_type_as_str(type, vtype), 1);
+}
+/* }}} */
+
+/* {{{ proto bool xmlrpc_is_fault(array)
+   Determines if an array value represents an XMLRPC fault. */
+PHP_FUNCTION(xmlrpc_is_fault)
+{
+       zval **arg, **val;
+
+       if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, &arg) == FAILURE)) {
+               WRONG_PARAM_COUNT;
+       }
+
+       if (Z_TYPE_PP(arg) != IS_ARRAY) {
+               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Array argument expected");
+       } else {
+               /* The "correct" way to do this would be to call the xmlrpc
+                * library XMLRPC_ValueIsFault() func.  However, doing that
+                * would require us to create an xmlrpc value from the php
+                * array, which is rather expensive, especially if it was
+                * a big array.  Thus, we resort to this not so clever hackery.
+                */
+               if (zend_hash_find(Z_ARRVAL_PP(arg), FAULT_CODE, FAULT_CODE_LEN + 1, (void**) &val) == SUCCESS && 
+                   zend_hash_find(Z_ARRVAL_PP(arg), FAULT_STRING, FAULT_STRING_LEN + 1, (void**) &val) == SUCCESS) {
+                       RETURN_TRUE;
+               }
+       }
+
+       RETURN_FALSE;
+}
+/* }}} */
+
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+