- Fixed a leak in xml_decode().

- Fixed it so it's possible to compile as a shared extension.

diff --git a/ext/rpc/xmlrpc/config.m4 b/ext/rpc/xmlrpc/config.m4
index 2b6b883756e3b1bb93e7c3220dfa0bc5cd5dd9f8..5da82a76becff3bfc11f6e36b14d5979ca614b6e 100644 (file)
--- a/ext/rpc/xmlrpc/config.m4
+++ b/ext/rpc/xmlrpc/config.m4
@@ -10,6 +10,8 @@ sinclude(libxmlrpc/xmlrpc.m4)
 PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support,
 [  --with-xmlrpc[=DIR]     Include XMLRPC-EPI support.])
 
+xmlrpc_ext_shared=$ext_shared
+
 PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI,
 [  --with-expat-dir=DIR      XMLRPC-EPI: libexpat dir for XMLRPC-EPI.])
 
@@ -48,7 +50,7 @@ if test "$PHP_XMLRPC" = "yes"; then
           libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
           libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
           libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
-          libxmlrpc/xml_to_soap.c,$ext_shared,,
+          libxmlrpc/xml_to_soap.c,$xmlrpc_ext_shared,,
           -I@ext_srcdir@/libxmlrpc -DVERSION="0.50")
   PHP_ADD_BUILD_DIR($ext_builddir/libxmlrpc)
   XMLRPC_MODULE_TYPE=builtin

diff --git a/ext/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c
index cfb4bd33c6b31cb70da24ea3209863d20264e4bd..8e51d2e6a57b50cb3e06b410ae2ae554dab99bf5 100644 (file)
--- a/ext/rpc/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/rpc/xmlrpc/xmlrpc-epi-php.c
@@ -776,7 +776,7 @@ PHP_FUNCTION(xmlrpc_decode)
       zval* retval = decode_request_worker(arg1, arg2, NULL);
       if(retval) {
          *return_value = *retval;
-         zval_copy_ctor(return_value);
+                FREE_ZVAL(retval);
       }
    }
 }

diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 2b6b883756e3b1bb93e7c3220dfa0bc5cd5dd9f8..5da82a76becff3bfc11f6e36b14d5979ca614b6e 100644 (file)
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -10,6 +10,8 @@ sinclude(libxmlrpc/xmlrpc.m4)
 PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support,
 [  --with-xmlrpc[=DIR]     Include XMLRPC-EPI support.])
 
+xmlrpc_ext_shared=$ext_shared
+
 PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI,
 [  --with-expat-dir=DIR      XMLRPC-EPI: libexpat dir for XMLRPC-EPI.])
 
@@ -48,7 +50,7 @@ if test "$PHP_XMLRPC" = "yes"; then
           libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
           libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
           libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
-          libxmlrpc/xml_to_soap.c,$ext_shared,,
+          libxmlrpc/xml_to_soap.c,$xmlrpc_ext_shared,,
           -I@ext_srcdir@/libxmlrpc -DVERSION="0.50")
   PHP_ADD_BUILD_DIR($ext_builddir/libxmlrpc)
   XMLRPC_MODULE_TYPE=builtin

diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index cfb4bd33c6b31cb70da24ea3209863d20264e4bd..8e51d2e6a57b50cb3e06b410ae2ae554dab99bf5 100644 (file)
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -776,7 +776,7 @@ PHP_FUNCTION(xmlrpc_decode)
       zval* retval = decode_request_worker(arg1, arg2, NULL);
       if(retval) {
          *return_value = *retval;
-         zval_copy_ctor(return_value);
+                FREE_ZVAL(retval);
       }
    }
 }