projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4b25902
)
Fix windows: crash in xmlDocFormatDump PAZ-1021
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 13 Aug 2015 11:57:38 +0000
(13:57 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 13 Aug 2015 11:57:38 +0000
(13:57 +0200)
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.
src/pazpar2_config.c
patch
|
blob
|
history
diff --git
a/src/pazpar2_config.c
b/src/pazpar2_config.c
index
c164680
..
7dc6e89
100644
(file)
--- 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);