X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=41e693c52403406ada3dee92c9a4fd05c4aca833;hb=044aeb161deeb1401cb68f9c3139c8fe46c62e2a;hp=7f9691ac2e3ed493022bdb1395a42c4570311d6b;hpb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 7f9691a..41e693c 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -284,7 +284,13 @@ void connection_continue(struct connection *co)
 {
     int r = ZOOM_connection_exec_task(co->link);
     if (!r)
+    {
+        struct client *cl = co->client;
+
+        client_lock(cl);
         non_block_events(co);
+        client_unlock(cl);
+    }
     else
     {
         iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
@@ -414,6 +420,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
 
     struct session_database *sdb = client_get_database(con->client);
     const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
+    const char *memcached = session_setting_oneval(sdb, PZ_MEMCACHED);
 
     assert(con);
 
@@ -423,6 +430,8 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
 
     if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET)))
         ZOOM_options_set(zoptions, "charset", charset);
+    if (memcached && *memcached)
+        ZOOM_options_set(zoptions, "memcached", memcached);
 
     assert(host->ipport);
     if (host->proxy)