diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2008-12-09 17:22:12 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2008-12-09 17:22:12 +0000 |
| commit | 780ff63c377dc79de2c04d6b341913ab0102135b (patch) | |
| tree | 6275f9edf02dd82b87bf958bc34da8d2ee01229a /ext/xmlrpc | |
| parent | 9049b6948ec0a0dc765dc1d847f3d9c0e974dea8 (diff) | |
| download | php-git-780ff63c377dc79de2c04d6b341913ab0102135b.tar.gz | |
MFH: Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable error
when given bad data).
Diffstat (limited to 'ext/xmlrpc')
| -rw-r--r-- | ext/xmlrpc/libxmlrpc/xml_element.c | 9 | ||||
| -rw-r--r-- | ext/xmlrpc/libxmlrpc/xmlrpc.c | 19 |
2 files changed, 19 insertions, 9 deletions
diff --git a/ext/xmlrpc/libxmlrpc/xml_element.c b/ext/xmlrpc/libxmlrpc/xml_element.c index 0ae08db7d5..3762f80080 100644 --- a/ext/xmlrpc/libxmlrpc/xml_element.c +++ b/ext/xmlrpc/libxmlrpc/xml_element.c @@ -44,6 +44,9 @@ static const char rcsid[] = "#(@) $Id$"; * 06/2000 * HISTORY * $Log$ + * Revision 1.9.4.1 2006/07/30 11:34:02 tony2001 + * MFH: fix compile warnings (#38257) + * * Revision 1.9 2005/04/22 11:06:53 jorton * Fixed bug #32797 (invalid C code in xmlrpc extension). * @@ -375,7 +378,7 @@ static void xml_element_serialize(xml_element *el, int (*fptr)(void *data, const depth++; if(!el) { - fprintf(stderr, "Nothing to write\n"); + /* fprintf(stderr, "Nothing to write\n"); */ return; } if(!options) { @@ -722,7 +725,7 @@ xml_element* xml_elem_parse_buf(const char* in_buf, int len, XML_ELEM_INPUT_OPTI byte_idx > 10 ? 10 : byte_idx, in_buf + (byte_idx > 10 ? byte_idx - 10 : byte_idx)); } - +/* fprintf(stderr, "expat reports error code %i\n" "\tdescription: %s\n" "\tline: %i\n" @@ -731,7 +734,7 @@ xml_element* xml_elem_parse_buf(const char* in_buf, int len, XML_ELEM_INPUT_OPTI "\ttotal bytes: %i\n%s ", err_code, error_str, line_num, col_num, byte_idx, byte_total, buf); - +*/ /* error condition */ if(error) { diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.c b/ext/xmlrpc/libxmlrpc/xmlrpc.c index 7b27caee3e..ec2321b347 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.c +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.c @@ -43,6 +43,13 @@ static const char rcsid[] = "#(@) $Id$"; * 9/1999 - 10/2000 * HISTORY * $Log$ + * Revision 1.8.4.3.2.1 2008/09/10 00:07:44 felipe + * MFH: + * - Merged fix from SF project (Import Jeff Lawsons patches for XML datetime bug fixes) + * Fixed bugs: + * #45226 (xmlrpc_set_type() segfaults with valid ISO8601 date string) + * #18916 (xmlrpc_set_type() "not working") + * * Revision 1.8.4.3 2007/09/18 19:49:53 iliaa * * Fixed bug #42189 (xmlrpc_set_type() crashes php on invalid datetime @@ -1161,13 +1168,13 @@ int XMLRPC_AddValueToVector(XMLRPC_VALUE target, XMLRPC_VALUE source) { } } else { - fprintf (stderr, - "xmlrpc: attempted to add key/val pair to vector of type array\n"); + /* fprintf (stderr, + "xmlrpc: attempted to add key/val pair to vector of type array\n"); */ } break; default: - fprintf (stderr, - "xmlrpc: attempted to add value of unknown type to vector\n"); + /* fprintf (stderr, + "xmlrpc: attempted to add value of unknown type to vector\n"); */ break; } } @@ -1497,8 +1504,8 @@ void XMLRPC_CleanupValue(XMLRPC_VALUE value) { my_free(value); break; default: - fprintf (stderr, - "xmlrpc: attempted to free value of invalid type\n"); + /* fprintf (stderr, + "xmlrpc: attempted to free value of invalid type\n"); */ break; } } |