Merge !470: daemon: restart client's tcp session timer after answer

daemon/io.c

@@ -213,7 +213,7 @@ static void tcp_timeout_trigger(uv_timer_t *timer)
 	assert(session->outgoing == false);
 	if (session->tasks.len > 0) {
 		uv_timer_again(timer);
-	} else {
+	} else if (!session->closing) {
 		uv_timer_stop(timer);
 		worker_session_close(session);
 	}

daemon/worker.c

@@ -1412,6 +1412,11 @@ static int qr_task_finalize(struct qr_task *task, int state)
 		(void) qr_task_send(task, handle,
 				    (struct sockaddr *)&ctx->source.addr,
 				    ctx->req.answer);
+		if (handle->type == UV_TCP) {
+			/* Don't try to close source session at least
+			 * retry_interval_for_timeout_timer milliseconds */
+			uv_timer_again(&ctx->source.session->timeout);
+		}
 	} else {
 		(void) qr_task_on_send(task, NULL, kr_error(EIO));
 	}