summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam M. Brack <wbrack@src.gnome.org>2005-01-19 02:21:23 +0000
committerWilliam M. Brack <wbrack@src.gnome.org>2005-01-19 02:21:23 +0000
commit58aaf5764a848c1cc7ece0800198c7a870417bc8 (patch)
tree9b3561c946c2e53f267bb3f9314b15054929ccef
parentdff5c00c54b1617c0273c89d8486acb05dd29cb2 (diff)
downloadlibxslt-58aaf5764a848c1cc7ece0800198c7a870417bc8.tar.gz
libxslt-58aaf5764a848c1cc7ece0800198c7a870417bc8.tar.bz2
libxslt-58aaf5764a848c1cc7ece0800198c7a870417bc8.zip
fixed problem with parserOptions not being set before loading a new
* transform.c: fixed problem with parserOptions not being set before loading a new document (bug 164530)
-rw-r--r--ChangeLog5
-rw-r--r--libxslt/transform.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 95e95ae6..328d05eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 19 10:21:37 HKT 2005 William Brack <wbrack@mmm.com.hk>
+
+ * transform.c: fixed problem with parserOptions not being
+ set before loading a new document (bug 164530)
+
Mon Jan 17 16:50:02 CET 2005 Daniel Veillard <daniel@veillard.com>
* configure.in libxslt/Makefile.am libxslt/xsltwin32config.h
diff --git a/libxslt/transform.c b/libxslt/transform.c
index 273af3a5..2565ba9b 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -442,6 +442,11 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {
*/
if (xslDebugStatus == XSLT_DEBUG_NONE)
xmlXPathOrderDocElems(doc);
+ /*
+ * Must set parserOptions before calling xsltNewDocument
+ * (bug 164530)
+ */
+ cur->parserOptions = XSLT_PARSE_OPTIONS;
docu = xsltNewDocument(cur, doc);
if (docu == NULL) {
xsltTransformError(cur, NULL, (xmlNodePtr)doc,
@@ -454,12 +459,10 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {
docu->main = 1;
cur->document = docu;
cur->inst = NULL;
- cur->xinclude = xsltDoXIncludeDefault;
cur->outputFile = NULL;
cur->sec = xsltGetDefaultSecurityPrefs();
cur->debugStatus = xslDebugStatus;
cur->traceCode = (unsigned long*) &xsltDefaultTrace;
- cur->parserOptions = XSLT_PARSE_OPTIONS;
cur->dict = xmlDictCreateSub(style->dict);
#ifdef WITH_XSLT_DEBUG