Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Feb 2013 12:43:35 +0000 (13:43 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Feb 2013 12:43:35 +0000 (13:43 +0100)
1  2 
src/client.c
src/connection.c

diff --cc src/client.c
@@@ -678,9 -678,9 +678,10 @@@ void client_record_response(struct clie
          else
          {
              client_record_ingest(cl);
+             *got_records = 1;
          }
      }
 +    session_leave_rw(cl->session, "client_record_response");
  }
  
  int client_reingest(struct client *cl)
Simple merge