Update to work with libxml 2.9.0

diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c
index d61ba796ab57df40f14d947c75acbd5c6c81fb73..eee3b5f887d459dd4f2f5c3d7260d84306c65672 100644 (file)
--- a/ext/dom/documenttype.c
+++ b/ext/dom/documenttype.c
@@ -205,7 +205,11 @@ int dom_documenttype_internal_subset_read(dom_object *obj, zval **retval TSRMLS_
                if (buff != NULL) {
                        xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset, 0, 0, NULL);
                        xmlOutputBufferFlush(buff);
+#ifdef LIBXML2_NEW_BUFFER
+                       ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff), xmlOutputBufferGetSize(buff), 1);
+#else
                        ZVAL_STRINGL(*retval, buff->buffer->content, buff->buffer->use, 1);
+#endif
                        (void)xmlOutputBufferClose(buff);
                        return SUCCESS;
                }

diff --git a/ext/dom/node.c b/ext/dom/node.c
index 5bcb234762efc560d0acbae9bba75c76b12dc41c..727d1bcef3867dd8320b214d1d1a2c7d2ecac960 100644 (file)
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -1895,9 +1895,17 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
         RETVAL_FALSE;
     } else {
                if (mode == 0) {
+#ifdef LIBXML2_NEW_BUFFER
+                       ret = xmlOutputBufferGetSize(buf);
+#else
                        ret = buf->buffer->use;
+#endif
                        if (ret > 0) {
+#ifdef LIBXML2_NEW_BUFFER
+                               RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf), ret, 1);
+#else
                                RETVAL_STRINGL((char *) buf->buffer->content, ret, 1);
+#endif
                        } else {
                                RETVAL_EMPTY_STRING();
                        }

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index a379111021e24ef020a2eefd8ca830cb1ab5b280..236859686f5942354e440a6084ec07673710ab6c 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1387,7 +1387,11 @@ SXE_METHOD(asXML)
 
                        xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding);
                        xmlOutputBufferFlush(outbuf);
+#ifdef LIBXML2_NEW_BUFFER
+                       RETVAL_STRINGL((char *)xmlOutputBufferGetContent(outbuf), xmlOutputBufferGetSize(outbuf), 1);
+#else
                        RETVAL_STRINGL((char *)outbuf->buffer->content, outbuf->buffer->use, 1);
+#endif
                        xmlOutputBufferClose(outbuf);
                }
        } else {