Enable the myExternalEntityLoader also on libxml 2.14.4 for MacOS

Author: jeroen

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: xml2
 Title: Parse XML
-Version: 1.5.1.9000
+Version: 1.5.2
 Authors@R: c(
     person("Hadley", "Wickham", role = "aut"),
     person("Jim", "Hester", role = "aut"),

NEWS.md

@@ -1,3 +1,7 @@
+# xml2 1.5.2
+
+* Enable the myExternalEntityLoader also on libxml 2.14.4 for MacOS
+
 # xml2 1.5.1
 
 * Avoid shared libxml2 on MacOS because this reveals bugs in R.app (#471)

src/xml2_init.c

@@ -53,7 +53,7 @@ void handleGenericError(void *ctx, const char *fmt, ...){
   Rf_error("%s", buffer);
 }
 
-#if LIBXML_VERSION >= 21500
+#if LIBXML_VERSION >= 21404
 
 static xmlExternalEntityLoader defaultLoader = NULL;
 
@@ -65,7 +65,10 @@ xmlParserInput *download_file_callback(const char *url){
   int err = 1;
   SEXP out = PROTECT(R_tryEvalSilent(call, env, &err));
   if(err) return NULL;
-  xmlParserInputFlags flags = XML_INPUT_BUF_STATIC | XML_INPUT_USE_SYS_CATALOG;
+  xmlParserInputFlags flags = XML_INPUT_BUF_STATIC;
+#if LIBXML_VERSION >= 21500
+  flags |= XML_INPUT_USE_SYS_CATALOG
+#endif
   xmlParserInput *buf = xmlNewInputFromMemory(url, RAW(out), Rf_length(out), flags);
   //xmlParserInputBuffer *buf = xmlParserInputBufferCreateMem((char*) RAW(out), Rf_length(out), XML_CHAR_ENCODING_UTF8);
   UNPROTECT(4);
@@ -96,7 +99,7 @@ void init_libxml2_library(void) {
   xmlSetGenericErrorFunc(NULL, handleGenericError);
 
   // Set custom download callback
-#if LIBXML_VERSION >= 21500
+#if LIBXML_VERSION >= 21404
   defaultLoader = xmlGetExternalEntityLoader();
   xmlSetExternalEntityLoader(myExternalEntityLoader);
 #endif