author | Petr Sumbera <petr.sumbera@oracle.com> |
Thu, 20 Dec 2012 04:53:01 -0800 | |
branch | s11-update |
changeset 2452 | 9dc4dfa4b04d |
permissions | -rw-r--r-- |
2452
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Update to work with libxml 2.9.0 |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
|
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
https://github.com/php/php-src/commit/c4b26cc1b0b0521c75e653fffec2a9e3b4bf8cbb |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
|
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
index d61ba79..eee3b5f 100644 |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
--- a/ext/dom/documenttype.c |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
+++ b/ext/dom/documenttype.c |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
@@ -205,7 +205,11 @@ int dom_documenttype_internal_subset_read(dom_object *obj, zval **retval TSRMLS_ |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
if (buff != NULL) { |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset, 0, 0, NULL); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
xmlOutputBufferFlush(buff); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+#ifdef LIBXML2_NEW_BUFFER |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff), xmlOutputBufferGetSize(buff), 1); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+#else |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
ZVAL_STRINGL(*retval, buff->buffer->content, buff->buffer->use, 1); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+#endif |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
(void)xmlOutputBufferClose(buff); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
return SUCCESS; |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
} |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
diff --git a/ext/dom/node.c b/ext/dom/node.c |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
index 5bcb234..727d1bc 100644 |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
--- a/ext/dom/node.c |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+++ b/ext/dom/node.c |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
@@ -1895,9 +1895,17 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
RETVAL_FALSE; |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
} else { |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
if (mode == 0) { |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
+#ifdef LIBXML2_NEW_BUFFER |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
+ ret = xmlOutputBufferGetSize(buf); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
+#else |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
ret = buf->buffer->use; |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
+#endif |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
if (ret > 0) { |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
+#ifdef LIBXML2_NEW_BUFFER |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
+ RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf), ret, 1); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
+#else |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
RETVAL_STRINGL((char *) buf->buffer->content, ret, 1); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
+#endif |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
} else { |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
RETVAL_EMPTY_STRING(); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
} |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
index a379111..2368596 100644 |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
--- a/ext/simplexml/simplexml.c |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
+++ b/ext/simplexml/simplexml.c |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |
@@ -1387,7 +1387,11 @@ static int sxe_objects_compare(zval *object1, zval *object2 TSRMLS_DC) /* {{{ */ |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
48 |
|
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
49 |
xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
50 |
xmlOutputBufferFlush(outbuf); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
51 |
+#ifdef LIBXML2_NEW_BUFFER |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
52 |
+ RETVAL_STRINGL((char *)xmlOutputBufferGetContent(outbuf), xmlOutputBufferGetSize(outbuf), 1); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
+#else |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
54 |
RETVAL_STRINGL((char *)outbuf->buffer->content, outbuf->buffer->use, 1); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
55 |
+#endif |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
56 |
xmlOutputBufferClose(outbuf); |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
57 |
} |
9dc4dfa4b04d
15825143 SUNBT7206540 Upgrade libxml2 to version 2.9.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
58 |
} else { |