]>
Commit | Line | Data |
---|---|---|
6ec4c35f AM |
1 | commit c4b26cc1b0b0521c75e653fffec2a9e3b4bf8cbb |
2 | Author: Daniel Veillard <veillard@redhat.com> | |
3 | Date: Thu Aug 9 14:02:33 2012 -0400 | |
4 | ||
5 | Update to work with libxml 2.9.0 | |
6 | ||
7 | diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c | |
8 | index d61ba79..eee3b5f 100644 | |
9 | --- a/ext/dom/documenttype.c | |
10 | +++ b/ext/dom/documenttype.c | |
11 | @@ -205,7 +205,11 @@ int dom_documenttype_internal_subset_read(dom_object *obj, zval **retval TSRMLS_ | |
12 | if (buff != NULL) { | |
13 | xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset, 0, 0, NULL); | |
14 | xmlOutputBufferFlush(buff); | |
15 | +#ifdef LIBXML2_NEW_BUFFER | |
16 | + ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff), xmlOutputBufferGetSize(buff), 1); | |
17 | +#else | |
18 | ZVAL_STRINGL(*retval, buff->buffer->content, buff->buffer->use, 1); | |
19 | +#endif | |
20 | (void)xmlOutputBufferClose(buff); | |
21 | return SUCCESS; | |
22 | } | |
23 | diff --git a/ext/dom/node.c b/ext/dom/node.c | |
24 | index 5bcb234..727d1bc 100644 | |
25 | --- a/ext/dom/node.c | |
26 | +++ b/ext/dom/node.c | |
27 | @@ -1895,9 +1895,17 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ | |
28 | RETVAL_FALSE; | |
29 | } else { | |
30 | if (mode == 0) { | |
31 | +#ifdef LIBXML2_NEW_BUFFER | |
32 | + ret = xmlOutputBufferGetSize(buf); | |
33 | +#else | |
34 | ret = buf->buffer->use; | |
35 | +#endif | |
36 | if (ret > 0) { | |
37 | +#ifdef LIBXML2_NEW_BUFFER | |
38 | + RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf), ret, 1); | |
39 | +#else | |
40 | RETVAL_STRINGL((char *) buf->buffer->content, ret, 1); | |
41 | +#endif | |
42 | } else { | |
43 | RETVAL_EMPTY_STRING(); | |
44 | } | |
45 | diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c | |
46 | index a379111..2368596 100644 | |
47 | --- a/ext/simplexml/simplexml.c | |
48 | +++ b/ext/simplexml/simplexml.c | |
49 | @@ -1387,7 +1387,11 @@ SXE_METHOD(asXML) | |
50 | ||
51 | xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding); | |
52 | xmlOutputBufferFlush(outbuf); | |
53 | +#ifdef LIBXML2_NEW_BUFFER | |
54 | + RETVAL_STRINGL((char *)xmlOutputBufferGetContent(outbuf), xmlOutputBufferGetSize(outbuf), 1); | |
55 | +#else | |
56 | RETVAL_STRINGL((char *)outbuf->buffer->content, outbuf->buffer->use, 1); | |
57 | +#endif | |
58 | xmlOutputBufferClose(outbuf); | |
59 | } | |
60 | } else { |