Merge branch 'master' into paz-927

diff --cc src/client.c
Simple merge

diff --cc src/connection.c
index 630db75,402bfcc..15bfc56
--- 1/src/connection.c
--- 2/src/connection.c
+++ b/src/connection.c
@@@ -341,12 -433,22 +342,14 @@@ static int connection_connect(struct co
          ZOOM_options_set(zoptions, "charset", charset);
      if (memcached && *memcached)
          ZOOM_options_set(zoptions, "memcached", memcached);
+     if (redis && *redis)
+         ZOOM_options_set(zoptions, "redis", redis);
  
 -    assert(host->ipport);
 -    if (host->proxy)
 -    {
 -        yaz_log(YLOG_LOG, "proxy=%s", host->ipport);
 -        ZOOM_options_set(zoptions, "proxy", host->ipport);
 -    }
 -    else
 +    if (con->zproxy)
      {
 -        assert(host->tproxy);
 -        yaz_log(YLOG_LOG, "tproxy=%s", host->ipport);
 -        ZOOM_options_set(zoptions, "tproxy", host->ipport);
 +        yaz_log(YLOG_LOG, "proxy=%s", con->zproxy);
 +        ZOOM_options_set(zoptions, "proxy", con->zproxy);
      }
 -
      if (apdulog && *apdulog)
          ZOOM_options_set(zoptions, "apdulog", apdulog);
  

diff --cc src/database.c
Simple merge

diff --cc src/pazpar2_config.c
index 82ce585,785293e..c8ae0a8
--- 1/src/pazpar2_config.c
--- 2/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@@ -54,7 -54,9 +54,8 @@@ struct conf_confi
  
      int no_threads;
      WRBUF confdir;
+     char *path;
      iochan_man_t iochan_man;
 -    database_hosts_t database_hosts;
  };
  
  struct service_xslt
@@@ -1288,8 -1307,10 +1305,9 @@@ struct conf_config *config_create(cons
  
      config->nmem = nmem;
      config->servers = 0;
+     config->path = nmem_strdup(nmem, ".");
      config->no_threads = 0;
      config->iochan_man = 0;
 -    config->database_hosts = database_hosts_create();
  
      config->confdir = wrbuf_alloc();
      if ((p = strrchr(fname,

diff --cc win/makefile
Simple merge