From: Michael Wallner <mike@php.net>
Date: Fri, 4 Oct 2013 09:22:43 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.5~16^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e2bda3508444190cb9b707dffe328a263ec60a1;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64230 (XMLReader does not suppress errors)
---

2e2bda3508444190cb9b707dffe328a263ec60a1
diff --cc ext/xmlreader/php_xmlreader.c
index 464998ce62,adf282120e..aae55c8b3e
--- 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);