Author: fredkiefer
Date: Fri Apr 11 23:43:14 2014
New Revision: 37792
URL: http://svn.gna.org/viewcvs/gnustep?rev=37792&view=rev
Log:
* Headers/Foundation/NSXMLNodeOptions.h: Add new 10.7 options.
* Source/NSXMLDocument.m: Use XML_PARSE_NONET as the default
option for xmlReadMemory. Add XML_PARSE_NOENT when
NSXMLNodeLoadExternalEntitiesNever is set.
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Headers/Foundation/NSXMLNodeOptions.h
libs/base/trunk/Source/NSXMLDocument.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=37792&r1=37791&r2=37792&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Fri Apr 11 23:43:14 2014
@@ -1,3 +1,10 @@
+2014-04-11 Fred Kiefer <[email protected]>
+
+ * Headers/Foundation/NSXMLNodeOptions.h: Add new 10.7 options.
+ * Source/NSXMLDocument.m: Use XML_PARSE_NONET as the default
+ option for xmlReadMemory. Add XML_PARSE_NOENT when
+ NSXMLNodeLoadExternalEntitiesNever is set.
+
2014-03-28 Richard Frith-Macdonald <[email protected]>
* Source/NSXMLParser.m: If parsing something which contains data
Modified: libs/base/trunk/Headers/Foundation/NSXMLNodeOptions.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Headers/Foundation/NSXMLNodeOptions.h?rev=37792&r1=37791&r2=37792&view=diff
==============================================================================
--- libs/base/trunk/Headers/Foundation/NSXMLNodeOptions.h (original)
+++ libs/base/trunk/Headers/Foundation/NSXMLNodeOptions.h Fri Apr 11
23:43:14 2014
@@ -97,10 +97,19 @@
NSXMLDocumentValidate = 1 << 13,
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_7,GS_API_LATEST)
+ NSXMLNodeLoadExternalEntitiesAlways = 1 << 14,
+ NSXMLNodeLoadExternalEntitiesSameOriginOnly = 1 << 15,
+#endif
+
NSXMLDocumentXInclude = 1 << 16,
NSXMLNodePrettyPrint = 1 << 17,
NSXMLDocumentIncludeContentTypeDeclaration = 1 << 18,
+
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_7,GS_API_LATEST)
+ NSXMLNodeLoadExternalEntitiesNever = 1 << 19,
+#endif
NSXMLNodePreserveNamespaceOrder = 1 << 20,
NSXMLNodePreserveAttributeOrder = 1 << 21,
Modified: libs/base/trunk/Source/NSXMLDocument.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSXMLDocument.m?rev=37792&r1=37791&r2=37792&view=diff
==============================================================================
--- libs/base/trunk/Source/NSXMLDocument.m (original)
+++ libs/base/trunk/Source/NSXMLDocument.m Fri Apr 11 23:43:14 2014
@@ -128,6 +128,15 @@
xmlOptions |= XML_PARSE_NOBLANKS;
//xmlKeepBlanksDefault(0);
}
+ if (mask & NSXMLNodeLoadExternalEntitiesNever)
+ {
+ xmlOptions |= XML_PARSE_NOENT;
+ }
+ if (!(mask & NSXMLNodeLoadExternalEntitiesAlways))
+ {
+ xmlOptions |= XML_PARSE_NONET;
+ }
+
doc = xmlReadMemory([data bytes], [data length],
url, encoding, xmlOptions);
if (doc == NULL)
@@ -425,7 +434,7 @@
#ifdef HAVE_LIBXSLT
xmlChar **params = NULL;
xmlDocPtr stylesheetDoc = xmlReadMemory([xslt bytes], [xslt length],
- NULL, NULL, XML_PARSE_NOERROR);
+ NULL, NULL, XML_PARSE_NOERROR |
XML_PARSE_NONET);
xsltStylesheetPtr stylesheet = xsltParseStylesheetDoc(stylesheetDoc);
xmlDocPtr resultDoc = NULL;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
