Merge branch 'master' into yaz-744

diff --cc src/tcpip.c
index 72461c1,ac0001e..c3e477d
--- 1/src/tcpip.c
--- 2/src/tcpip.c
+++ b/src/tcpip.c
@@@ -215,12 -205,8 +215,13 @@@ COMSTACK tcpip_type(int s, int flags, i
  #endif
  
  #if HAVE_GETADDRINFO
 +#if RESOLVER_THREAD
 +    sp->hoststr = 0;
 +    sp->pipefd[0] = sp->pipefd[1] = -1;
 +    sp->port = 0;
 +#endif
      sp->ai = 0;
+     sp->ai_connect = 0;
  #endif
      sp->altbuf = 0;
      sp->altsize = sp->altlen = 0;