summaryrefslogtreecommitdiff
path: root/ext/xmlreader/php_xmlreader.c
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2013-10-04 11:22:52 +0200
committerMichael Wallner <mike@php.net>2013-10-04 11:22:52 +0200
commite13e5b17ffce68c7ea65d3410a6b4fe433135914 (patch)
tree3235afd42e0fa716650e37f0fab26e036b32af62 /ext/xmlreader/php_xmlreader.c
parent099b295646b108ad56d1ec3b37dfcb5812fd378c (diff)
parent2e2bda3508444190cb9b707dffe328a263ec60a1 (diff)
downloadphp-git-e13e5b17ffce68c7ea65d3410a6b4fe433135914.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: Fixed bug #64230 (XMLReader does not suppress errors)
Diffstat (limited to 'ext/xmlreader/php_xmlreader.c')
-rw-r--r--ext/xmlreader/php_xmlreader.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index 6ef25a235c..76cd56f144 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -799,7 +799,6 @@ PHP_METHOD(xmlreader, read)
if (intern != NULL && intern->ptr != NULL) {
retval = xmlTextReaderRead(intern->ptr);
if (retval == -1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading");
RETURN_FALSE;
} else {
RETURN_BOOL(retval);
@@ -841,7 +840,6 @@ PHP_METHOD(xmlreader, next)
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);