]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Fri, 4 Oct 2013 09:22:43 +0000 (11:22 +0200)
committerMichael Wallner <mike@php.net>
Fri, 4 Oct 2013 09:22:43 +0000 (11:22 +0200)
* PHP-5.4:
  Fixed bug #64230 (XMLReader does not suppress errors)

1  2 
ext/xmlreader/php_xmlreader.c

index 464998ce62f20038bd36ce168dfbab92ac5b66d7,adf282120e0b9e85431f181be95ed00a5bbe6aa0..aae55c8b3e2fa7f1fc5c013c7d8119863a408407
@@@ -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);