Merge branch 'master' into paz-927

diff --combined src/session.c
index abc53c7,325ba28..1cec7ea
--- 1/src/session.c
--- 2/src/session.c
+++ b/src/session.c
@@@ -497,6 -497,7 +497,6 @@@ static void select_targets_callback(str
          l->next = se->clients_cached;
          se->clients_cached = l;
      }
 -    /* set session always. If may be 0 if client is not active */
      client_set_session(cl, se);
  
      l = xmalloc(sizeof(*l));
@@@ -545,7 -546,6 +545,7 @@@ static void session_remove_cached_clien
          client_lock(l->client);
          client_set_session(l->client, 0);
          client_set_database(l->client, 0);
 +        client_mark_dead(l->client);
          client_unlock(l->client);
          client_destroy(l->client);
          xfree(l);
@@@ -1162,7 -1162,7 +1162,7 @@@ static int targets_termlist_nb(WRBUF wr
  void perform_termlist(struct http_channel *c, struct session *se,
                        const char *name, int num, int version)
  {
-     int i, j;
+     int j;
      NMEM nmem_tmp = nmem_create();
      char **names;
      int num_names = 0;