Fixed bug #40703 (Resolved a possible namespace conflict between libxmlrpc

and MySQL's NDB table handler).

diff --git a/NEWS b/NEWS
index 2d81830e77a7a8800a1bc1506e6b1fdf63b073a5..c4636b561a86f08a1762adbba60579ef7b33ad55 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ PHP                                                                        NEWS
 - Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
 - Fixed bug #40709 (array_reduce() behaves strange with one item stored arrays).
   (Ilia)
+- Fixed bug #40703 (Resolved a possible namespace conflict between libxmlrpc
+  and MySQL's NDB table handler). (Ilia)
 - Fixed bug #40678 (Cross compilation fails). (Tony)
 - Fixed bug #40621 (Crash when constructor called inappropriately). (Tony)
 - Fixed bug #40609 (Segfaults when using more than one SoapVar in a request).

diff --git a/ext/xmlrpc/libxmlrpc/base64.c b/ext/xmlrpc/libxmlrpc/base64.c
index 7788d028d7859204d0c1ef8e0095e2939d89d41e..d020bd6646287a8a7a9e5c6242f8080f58c9f027 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/base64.c
+++ b/ext/xmlrpc/libxmlrpc/base64.c
@@ -49,7 +49,7 @@ void buffer_delete(struct buffer_st *b)
   b->data = NULL;
 }
 
-void base64_encode(struct buffer_st *b, const char *source, int length)
+void base64_encode_xmlrpc(struct buffer_st *b, const char *source, int length)
 {
   int i, hiteof = 0;
   int offset = 0;
@@ -114,7 +114,7 @@ void base64_encode(struct buffer_st *b, const char *source, int length)
   buffer_add(b, '\n');
 }
 
-void base64_decode(struct buffer_st *bfr, const char *source, int length)
+void base64_decode_xmlrpc(struct buffer_st *bfr, const char *source, int length)
 {
     int i;
     int offset = 0;

diff --git a/ext/xmlrpc/libxmlrpc/base64.h b/ext/xmlrpc/libxmlrpc/base64.h
index 4cf156ad1e6f8cf183768e3527001d66f89ea629..6a0c8ef6fc855b0850b303d8760917ac83026f58 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/base64.h
+++ b/ext/xmlrpc/libxmlrpc/base64.h
@@ -21,8 +21,8 @@ void buffer_new(struct buffer_st *b);
 void buffer_add(struct buffer_st *b, char c);
 void buffer_delete(struct buffer_st *b);
 
-void base64_encode(struct buffer_st *b, const char *source, int length);
-void base64_decode(struct buffer_st *b, const char *source, int length);
+void base64_encode_xmlrpc(struct buffer_st *b, const char *source, int length);
+void base64_decode_xmlrpc(struct buffer_st *b, const char *source, int length);
 
 /*
 #define DEBUG_MALLOC

diff --git a/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c b/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c
index b51d99172361f4f06cfa50007df69293794c91ad..753222c55d8a28d69ce8dada995ae9574a8bbf05 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c
+++ b/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c
@@ -104,7 +104,7 @@ XMLRPC_VALUE xml_element_to_DANDARPC_REQUEST_worker(XMLRPC_REQUEST request, XMLR
          }
          else if(!strcmp(type, ATTR_BASE64)) {
             struct buffer_st buf;
-            base64_decode(&buf, el->text.str, el->text.len);
+            base64_decode_xmlrpc(&buf, el->text.str, el->text.len);
             XMLRPC_SetValueBase64(xCurrent, buf.data, buf.offset);
             buffer_delete(&buf);
          }
@@ -227,7 +227,7 @@ xml_element* DANDARPC_to_xml_element_worker(XMLRPC_REQUEST request, XMLRPC_VALUE
             {
                struct buffer_st buf;
                pAttrType = ATTR_BASE64;
-               base64_encode(&buf, XMLRPC_GetValueBase64(node), XMLRPC_GetValueStringLen(node));
+               base64_encode_xmlrpc(&buf, XMLRPC_GetValueBase64(node), XMLRPC_GetValueStringLen(node));
                simplestring_addn(&elem_val->text, buf.data, buf.offset );
                buffer_delete(&buf);
             }

diff --git a/ext/xmlrpc/libxmlrpc/xml_to_soap.c b/ext/xmlrpc/libxmlrpc/xml_to_soap.c
index b2ffc3a2a4383504e268b6a0b09cfede409c28d9..07c57087fbeeb1aa8eb1b7e4524e1168c1968ade 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xml_to_soap.c
+++ b/ext/xmlrpc/libxmlrpc/xml_to_soap.c
@@ -363,7 +363,7 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request,
                        }
                        else if (!strcmp(type, TOKEN_BASE64)) {
                                struct buffer_st buf;
-                               base64_decode(&buf, el->text.str, el->text.len);
+                               base64_decode_xmlrpc(&buf, el->text.str, el->text.len);
                                XMLRPC_SetValueBase64(xCurrent, buf.data, buf.offset);
                                buffer_delete(&buf);
                        }
@@ -529,7 +529,7 @@ xml_element* SOAP_to_xml_element_worker(XMLRPC_REQUEST request, XMLRPC_VALUE nod
                        {
                                struct buffer_st buf;
                                pAttrType = TOKEN_BASE64;
-                               base64_encode(&buf, XMLRPC_GetValueBase64(node), XMLRPC_GetValueStringLen(node));
+                               base64_encode_xmlrpc(&buf, XMLRPC_GetValueBase64(node), XMLRPC_GetValueStringLen(node));
                                simplestring_addn(&elem_val->text, buf.data, buf.offset );
                                buffer_delete(&buf);
                        }

diff --git a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
index 78643754cd3e67faffabc145a56a1e72d2983725..742afba15f26b3154442a03ba0cfc13e63167ca1 100644 (file)
--- a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
+++ b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c
@@ -139,7 +139,7 @@ XMLRPC_VALUE xml_element_to_XMLRPC_REQUEST_worker(XMLRPC_REQUEST request, XMLRPC
                }
                else if (!strcmp(el->name, ELEM_BASE64)) {
          struct buffer_st buf;
-         base64_decode(&buf, el->text.str, el->text.len);
+         base64_decode_xmlrpc(&buf, el->text.str, el->text.len);
          XMLRPC_SetValueBase64(current_val, buf.data, buf.offset);
          buffer_delete(&buf);
                }
@@ -242,7 +242,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA
             {
                struct buffer_st buf;
                elem_val->name = strdup(ELEM_BASE64);
-               base64_encode(&buf, XMLRPC_GetValueBase64(node), XMLRPC_GetValueStringLen(node));
+               base64_encode_xmlrpc(&buf, XMLRPC_GetValueBase64(node), XMLRPC_GetValueStringLen(node));
                simplestring_addn(&elem_val->text, buf.data, buf.offset );
                buffer_delete(&buf);
             }