moriyoshi Fri Dec 5 05:11:07 2003 EDT
Modified files:
/php-src/main php_compat.h
/php-src/ext/xml compat.c
Log:
Fix libexpat build.
Improve replaceEntities patch.
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.18 php-src/main/php_compat.h:1.19
--- php-src/main/php_compat.h:1.18 Sat Aug 9 10:27:16 2003
+++ php-src/main/php_compat.h Fri Dec 5 05:11:05 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_compat.h,v 1.18 2003/08/09 14:27:16 sniper Exp $ */
+/* $Id: php_compat.h,v 1.19 2003/12/05 10:11:05 moriyoshi Exp $ */
#ifndef PHP_COMPAT_H
#define PHP_COMPAT_H
@@ -48,7 +48,7 @@
#define hashTableIterInit php_hashTableIterInit
#define hashTableIterNext php_hashTableIterNext
-#if defined(HAVE_LIBXML) && defined(HAVE_XML)
+#if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT)
#define XML_DefaultCurrent php_XML_DefaultCurrent
#define XML_ErrorString php_XML_ErrorString
#define XML_ExpatVersion php_XML_ExpatVersion
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.21 php-src/ext/xml/compat.c:1.22
--- php-src/ext/xml/compat.c:1.21 Thu Dec 4 20:16:16 2003
+++ php-src/ext/xml/compat.c Fri Dec 5 05:11:06 2003
@@ -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 @@
} 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
