From: Adam Dickmeiss Date: Thu, 13 Aug 2015 11:57:38 +0000 (+0200) Subject: Fix windows: crash in xmlDocFormatDump PAZ-1021 X-Git-Tag: v1.12.0~5 X-Git-Url: http://git.indexdata.com/?p=pazpar2-moved-to-github.git;a=commitdiff_plain;h=4f540f411b3a09f282b75089a86ed9d86cc4846e Fix windows: crash in xmlDocFormatDump PAZ-1021 Problem is the passed FILE*. We can not pass FILE pointers between DLLs. So we just avoid dumping the XML config during start on Windows. --- diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index c164680..7dc6e89 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -1338,6 +1338,7 @@ struct conf_config *config_create(const char *fname) r = yaz_xml_include_simple(n, wrbuf_cstr(config->confdir)); if (r == 0) /* OK */ { +#ifndef WIN32 yaz_log(YLOG_LOG, "Configuration %s after include processing", fname); #if LIBXML_VERSION >= 20600 @@ -1345,6 +1346,7 @@ struct conf_config *config_create(const char *fname) #else xmlDocDump(yaz_log_file(), doc); #endif +#endif r = parse_config(config, n); } xmlFreeDoc(doc);