Commit: 2e2bda3508444190cb9b707dffe328a263ec60a1 Author: Michael Wallner <m...@php.net> Fri, 4 Oct 2013 11:22:43 +0200 Parents: 92fd085ebfb4cc8256cad235a51b34b246a4c3b7 f6ff3a28d60c24dea2a05344d9b7eb823f09b4e5 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2e2bda3508444190cb9b707dffe328a263ec60a1 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #64230 (XMLReader does not suppress errors) Bugs: https://bugs.php.net/64230 Changed paths: MM ext/xmlreader/php_xmlreader.c Diff: diff --cc ext/xmlreader/php_xmlreader.c index 464998c,adf2821..aae55c8 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@@ -844,10 -843,9 +843,9 @@@ PHP_METHOD(xmlreader, next if (xmlStrEqual(xmlTextReaderConstLocalName(intern->ptr), (xmlChar *)name)) { RETURN_TRUE; } - retval = xmlTextReaderNext(intern->ptr); + retval = xmlTextReaderNext(intern->ptr); } if (retval == -1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading"); RETURN_FALSE; } else { RETURN_BOOL(retval); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
