Author: mdounin
Date: 2012-03-28 01:56:49 +0000 (Wed, 28 Mar 2012)
New Revision: 4561
URL: http://trac.nginx.org/nginx/changeset/4561/nginx

Log:
Xslt: parser options now set with xmlCtxtUseOptions().

Note that "ctxt->loadsubset = 1" previously used isn't really correct as
ctxt->loadsubset is a bitfield now. The use of xmlCtxtUseOptions() with
XML_PARSE_DTDLOAD is believed to be a better way to do the same thing.

Patch by Laurence Rowe.


Modified:
trunk/src/http/modules/ngx_http_xslt_filter_module.c

Modified: trunk/src/http/modules/ngx_http_xslt_filter_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_xslt_filter_module.c 2012-03-27 16:44:52 UTC (rev 4560)
+++ trunk/src/http/modules/ngx_http_xslt_filter_module.c 2012-03-28 01:56:49 UTC (rev 4561)
@@ -362,15 +362,14 @@
"xmlCreatePushParserCtxt() failed");
return NGX_ERROR;
}
+ xmlCtxtUseOptions(ctxt, XML_PARSE_NOENT|XML_PARSE_DTDLOAD
+ |XML_PARSE_NOWARNING);

ctxt->sax->externalSubset = ngx_http_xslt_sax_external_subset;
ctxt->sax->setDocumentLocator = NULL;
- ctxt->sax->warning = NULL;
ctxt->sax->error = ngx_http_xslt_sax_error;
ctxt->sax->fatalError = ngx_http_xslt_sax_error;
ctxt->sax->_private = ctx;
- ctxt->replaceEntities = 1;
- ctxt->loadsubset = 1;

ctx->ctxt = ctxt;
ctx->request = r;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel