summaryrefslogtreecommitdiff
path: root/ext/xml
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2003-12-05 10:11:06 +0000
committerMoriyoshi Koizumi <moriyoshi@php.net>2003-12-05 10:11:06 +0000
commit50dad38cd4a97a54b354b7b16a9984a04b792d6e (patch)
tree269f3794e0cc47e6765ea796755754f382a16548 /ext/xml
parentf9470dafe0133ce275491682b224244d8f264c4a (diff)
downloadphp-git-50dad38cd4a97a54b354b7b16a9984a04b792d6e.tar.gz
Fix libexpat build.
Improve replaceEntities patch.
Diffstat (limited to 'ext/xml')
-rw-r--r--ext/xml/compat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index 5b878fa269..8deba58a24 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -17,7 +17,7 @@
*/
#include "php.h"
-#if HAVE_LIBXML && HAVE_XML
+#if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT)
#include "expat_compat.h"
typedef struct _php_xml_ns {
@@ -412,7 +412,7 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
} else {
parser->parser->charset = XML_CHAR_ENCODING_NONE;
}
- parser->parser->replaceEntities=1;
+ xmlCtxtUseOptions(parser->parser, XML_PARSE_NO_ENT);
if (sep != NULL) {
parser->use_namespace = 1;
parser->_ns_map = xmlHashCreate(10);