diff options
| author | Andrea Faulds <ajf@ajf.me> | 2013-10-15 22:38:46 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2013-10-15 22:38:46 +0000 |
| commit | 29e755ac6669fa1801bf1e1c1e6acee8d78c9498 (patch) | |
| tree | fa033f900da9649cf5064c7a9d2a4a8916403ee1 /ext/xmlreader/php_xmlreader.c | |
| parent | 8495d6303400edd9b84a6febd2a6b62b38e11c97 (diff) | |
| parent | b0a36007abb522b6b1e3a6b3108eb726053b9d72 (diff) | |
| download | php-git-29e755ac6669fa1801bf1e1c1e6acee8d78c9498.tar.gz | |
Merge branch 'PHP-5.4' into JSONWhitespaceFix
Diffstat (limited to 'ext/xmlreader/php_xmlreader.c')
| -rw-r--r-- | ext/xmlreader/php_xmlreader.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index f4c2643212..adf282120e 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -805,7 +805,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); @@ -847,7 +846,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); @@ -1320,6 +1318,7 @@ PHP_MINIT_FUNCTION(xmlreader) xmlreader_object_handlers.read_property = xmlreader_read_property; xmlreader_object_handlers.write_property = xmlreader_write_property; xmlreader_object_handlers.get_property_ptr_ptr = xmlreader_get_property_ptr_ptr; + xmlreader_object_handlers.clone_obj = NULL; INIT_CLASS_ENTRY(ce, "XMLReader", xmlreader_functions); ce.create_object = xmlreader_objects_new; |