clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

add workaround for libxml bug when using next() method

Browse Source 
remove some no longer needed windows specific code
This commit is contained in:
Rob Richards 2005-03-10 22:32:47 +00:00
parent cdb042f632
commit 8462621bd7
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/xmlreader/php_xmlreader.c
View File

@ -776,22 +776,17 @@ PHP_METHOD(xmlreader, next)
id = getThis();
intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL && intern->ptr != NULL) {
#if LIBXML_VERSION <= 20617
/* Bug in libxml prevents a next in certain cases when positioned on end of element */
if (xmlTextReaderNodeType(intern->ptr) == XML_READER_TYPE_END_ELEMENT) {
retval = xmlTextReaderRead(intern->ptr);
} else
#endif
retval = xmlTextReaderNext(intern->ptr);
while (name != NULL && retval == 1) {
#ifdef PHP_WIN32
/* xmlTextReaderConstLocalName should be used once its added to win def libxml.def file.
Doing so will not require localname to be freed as its not allocated */
xmlChar *localname = xmlTextReaderLocalName(intern->ptr);
if (xmlStrEqual(localname, name)) {
xmlFree(localname);
RETURN_TRUE;
}
xmlFree(localname);
#else
if (xmlStrEqual(xmlTextReaderConstLocalName(intern->ptr), name)) {
RETURN_TRUE;
}
#endif
retval = xmlTextReaderNext(intern->ptr);
}
if (retval == -1) {