X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmetaproxy_prog.cpp;h=5d176aeb51755d3e9f9230b4fb0bdbd4c1af6689;hb=74728b63c51be8dc60ba686c37244b2c468e263b;hp=fa0ea33858a6a5e29b8802d5a3736df004cb8369;hpb=5cb1f9609e107e4ba58e0d2726a28e0a3fe33135;p=metaproxy-moved-to-github.git

diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index fa0ea33..5d176ae 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -59,11 +59,15 @@ static void set_log_prefix(void)
 #if HAVE_UNISTD_H
 static pid_t process_group = 0;
 static int sig_received = 0;
+static pid_t my_pid = 0;
 
 static void sig_x_handler(int signo)
 {
     if (sig_received)
         return;
+    if ( getpid() != my_pid ) // can happen in unlikely cases
+        return; // when the sig hits a child just after fork(), before it
+                // clears its sighandler. MP-559.
     sig_received = signo;
     if (routerp)
         routerp->stop(signo);
@@ -77,6 +81,7 @@ static void work_common(void *data)
     set_log_prefix();
 #if HAVE_UNISTD_H
     process_group = getpgid(0); // save process group ID
+    my_pid = getpid();
 
     signal(SIGTERM, sig_x_handler);
     signal(SIGUSR1, sig_x_handler);
@@ -211,6 +216,9 @@ static int sc_main(
         , test_config ? "test" : "start"
             );
 
+    xmlInitParser();
+    LIBXML_TEST_VERSION
+
     yaz_log_xml_errors(0, YLOG_LOG);
     xmlDocPtr doc = xmlReadFile(fname,
                                 NULL,