Merge branch 'master' into features/XoT

diff --cc doc/unbound.conf.5.in
Simple merge

diff --cc services/authzone.c
index 2649867ed8279a0e0eeece9607eaafc69e6eefd5,225cb0a7a559e93e678261893e22d34e68646b1f..cabb00a846aac72bcfc8572ca1c2b4dd1d99cb36
--- 1/services/authzone.c
--- 2/services/authzone.c
+++ b/services/authzone.c
@@@ -5034,7 -5059,8 +5059,9 @@@ xfr_transfer_init_fetch(struct auth_xfe
        struct sockaddr_storage addr;
        socklen_t addrlen = 0;
        struct auth_master* master = xfr->task_transfer->master;
 +      char *auth_name = NULL;
+       struct timeval t;
+       int timeout;
        if(!master) return 0;
        if(master->allow_notify) return 0; /* only for notify */
  
@@@ -5092,15 -5139,23 +5140,24 @@@
        /* connect on fd */
        xfr->task_transfer->cp = outnet_comm_point_for_tcp(env->outnet,
                auth_xfer_transfer_tcp_callback, xfr, &addr, addrlen,
-               env->scratch_buffer, AUTH_TRANSFER_TIMEOUT,
 -              env->scratch_buffer, -1);
++              env->scratch_buffer, -1,
 +              auth_name != NULL, auth_name);
        if(!xfr->task_transfer->cp) {
-               char zname[255+1];
-               dname_str(xfr->name, zname);
+               char zname[255+1], as[256];
+               dname_str(xfr->name, zname);
+               addr_to_str(&addr, addrlen, as, sizeof(as));
                verbose(VERB_ALGO, "cannot create tcp cp connection for "
-                       "xfr %s to %s", zname, master->host);
+                       "xfr %s to %s", zname, as);
                return 0;
        }
+       comm_timer_set(xfr->task_transfer->timer, &t);
+       if(verbosity >= VERB_ALGO) {
+               char zname[255+1], as[256];
+               dname_str(xfr->name, zname);
+               addr_to_str(&addr, addrlen, as, sizeof(as));
+               verbose(VERB_ALGO, "auth zone %s transfer next %s fetch from %s started", zname, 
+                       (xfr->task_transfer->on_ixfr?"IXFR":"AXFR"), as);
+       }
        return 1;
  }