cvs: php-src(PHP_5_2) / NEWS /ext/xmlrpc/libxmlrpc base64.c base64.h xml_to_dandarpc.c xml_to_soap.c xml_to_xmlrpc.c

iliaa Sun Mar 4 18:24:49 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/xmlrpc/libxmlrpc base64.c base64.h xml_to_dandarpc.c xml_to_soap.c xml_to_xmlrpc.c Log: Fixed bug #40703 (Resolved a possible namespace conflict between libxmlrpc and MySQL's NDB table handler). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.571&r2=1.2027.2.547.2.572&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.571 php-src/NEWS:1.2027.2.547.2.572 --- php-src/NEWS:1.2027.2.547.2.571 Sun Mar 4 17:21:15 2007 +++ php-src/NEWS Sun Mar 4 18:24:49 2007 @@ -16,6 +16,8 @@ - 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). http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/base64.c?r1=1.4&r2=1.4.6.1&diff_format=u Index: php-src/ext/xmlrpc/libxmlrpc/base64.c diff -u php-src/ext/xmlrpc/libxmlrpc/base64.c:1.4 php-src/ext/xmlrpc/libxmlrpc/base64.c:1.4.6.1 --- php-src/ext/xmlrpc/libxmlrpc/base64.c:1.4 Tue Apr 27 17:33:59 2004 +++ php-src/ext/xmlrpc/libxmlrpc/base64.c Sun Mar 4 18:24:49 2007 @@ -1,4 +1,4 @@ -static const char rcsid[] = "#(@) $Id: base64.c,v 1.4 2004/04/27 17:33:59 iliaa Exp $"; +static const char rcsid[] = "#(@) $Id: base64.c,v 1.4.6.1 2007/03/04 18:24:49 iliaa Exp $"; /* @@ -49,7 +49,7 @@ 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 @@ 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; http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/base64.h?r1=1.1&r2=1.1.28.1&diff_format=u Index: php-src/ext/xmlrpc/libxmlrpc/base64.h diff -u php-src/ext/xmlrpc/libxmlrpc/base64.h:1.1 php-src/ext/xmlrpc/libxmlrpc/base64.h:1.1.28.1 --- php-src/ext/xmlrpc/libxmlrpc/base64.h:1.1 Thu Sep 6 04:13:29 2001 +++ php-src/ext/xmlrpc/libxmlrpc/base64.h Sun Mar 4 18:24:49 2007 @@ -21,8 +21,8 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c?r1=1.3&r2=1.3.26.1&diff_format=u Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c:1.3 php-src/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c:1.3.26.1 --- php-src/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c:1.3 Mon Dec 3 22:33:31 2001 +++ php-src/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c Sun Mar 4 18:24:49 2007 @@ -104,7 +104,7 @@ } 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 @@ { 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); } http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c?r1=1.4.4.1.2.1&r2=1.4.4.1.2.2&diff_format=u Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c:1.4.4.1.2.1 php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c:1.4.4.1.2.2 --- php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c:1.4.4.1.2.1 Fri Feb 23 21:14:52 2007 +++ php-src/ext/xmlrpc/libxmlrpc/xml_to_soap.c Sun Mar 4 18:24:49 2007 @@ -363,7 +363,7 @@ } 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 @@ { 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); } http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c?r1=1.5.6.1&r2=1.5.6.2&diff_format=u Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.1 php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.2 --- php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.1 Wed Feb 21 14:25:27 2007 +++ php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c Sun Mar 4 18:24:49 2007 @@ -31,7 +31,7 @@ */ -static const char rcsid[] = "#(@) $Id: xml_to_xmlrpc.c,v 1.5.6.1 2007/02/21 14:25:27 tony2001 Exp $"; +static const char rcsid[] = "#(@) $Id: xml_to_xmlrpc.c,v 1.5.6.2 2007/03/04 18:24:49 iliaa Exp $"; #ifdef _WIN32 #include "xmlrpc_win32.h" @@ -139,7 +139,7 @@ } 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 @@ { 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); }