From: Felipe Pena Date: Tue, 27 Jan 2009 15:02:43 +0000 (+0000) Subject: MFH: X-Git-Tag: php-5.2.9RC1~24 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e3465a61f3ff8ddf7891ed5dad5ba077c9de0b7;p=php MFH: - Fix compile warning - Fixed test --- diff --git a/ext/xmlrpc/tests/bug45556.phpt b/ext/xmlrpc/tests/bug45556.phpt index 9c73e0e5df..b1956e568a 100644 --- a/ext/xmlrpc/tests/bug45556.phpt +++ b/ext/xmlrpc/tests/bug45556.phpt @@ -25,16 +25,7 @@ xmlrpc_server_call_method ($server, $request, NULL, $options); ?> --EXPECTF-- - Warning: xmlrpc_server_call_method(): Invalid callback 'foobar' passed in %s on line %d -expat reports error code 5 - description: Invalid document end - line: 1 - column: 1 - byte index: 0 - total bytes: 0 - - data beginning 0 before byte index: foo Warning: xmlrpc_server_call_method(): xml parse error: [line 1, column 1, message: Invalid document end] Unable to add introspection data returned from bar::test() in %s on line %d diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 9ffc75a3f9..e94639a8f7 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -658,7 +658,7 @@ PHP_FUNCTION(xmlrpc_encode_request) } } - if (out.xmlrpc_out.xml_elem_opts.encoding != ENCODING_DEFAULT) { + if (strcmp(out.xmlrpc_out.xml_elem_opts.encoding, ENCODING_DEFAULT) != 0) { efree((char *)out.xmlrpc_out.xml_elem_opts.encoding); } }