projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use simpler var for timeout in event loop
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
51468c4
..
402bfcc
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 Index Data
+ Copyright (C) Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-284,7
+284,13
@@
void connection_continue(struct connection *co)
{
int r = ZOOM_connection_exec_task(co->link);
if (!r)
{
int r = ZOOM_connection_exec_task(co->link);
if (!r)
+ {
+ struct client *cl = co->client;
+
+ client_lock(cl);
non_block_events(co);
non_block_events(co);
+ client_unlock(cl);
+ }
else
{
iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
else
{
iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
@@
-390,7
+396,6
@@
void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
}
else
{
}
else
{
- yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
con = con->next;
}
}
con = con->next;
}
}
@@
-410,10
+415,13
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
const char *charset;
const char *sru;
const char *sru_version = 0;
const char *charset;
const char *sru;
const char *sru_version = 0;
+ const char *value;
WRBUF w;
struct session_database *sdb = client_get_database(con->client);
const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
WRBUF w;
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);
+ const char *redis = session_setting_oneval(sdb, PZ_REDIS);
assert(con);
assert(con);
@@
-423,6
+431,10
@@
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 ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET)))
ZOOM_options_set(zoptions, "charset", charset);
+ if (memcached && *memcached)
+ ZOOM_options_set(zoptions, "memcached", memcached);
+ if (redis && *redis)
+ ZOOM_options_set(zoptions, "redis", redis);
assert(host->ipport);
if (host->proxy)
assert(host->ipport);
if (host->proxy)
@@
-440,13
+452,27
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
if (apdulog && *apdulog)
ZOOM_options_set(zoptions, "apdulog", apdulog);
if (apdulog && *apdulog)
ZOOM_options_set(zoptions, "apdulog", apdulog);
+
+ if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
+ ZOOM_options_set(zoptions, "sru", sru);
+ if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
+ && *sru_version)
+ ZOOM_options_set(zoptions, "sru_version", sru_version);
+
if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION)))
{
if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION)))
{
+ /* allow splitting user and reset with a blank always */
const char *cp1 = strchr(auth, ' ');
const char *cp1 = strchr(auth, ' ');
+ if (!cp1 && sru && *sru)
+ cp1 = strchr(auth, '/');
if (!cp1)
if (!cp1)
+ {
+ /* Z39.50 user/password style, or no password for SRU */
ZOOM_options_set(zoptions, "user", auth);
ZOOM_options_set(zoptions, "user", auth);
+ }
else
{
else
{
+ /* now consider group as well */
const char *cp2 = strchr(cp1 + 1, ' ');
ZOOM_options_setl(zoptions, "user", auth, cp1 - auth);
const char *cp2 = strchr(cp1 + 1, ' ');
ZOOM_options_setl(zoptions, "user", auth, cp1 - auth);
@@
-459,11
+485,11
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
}
}
}
}
}
}
- if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
- ZOOM_options_set(zoptions, "sru", sru);
- if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
- && *sru_version)
- ZOOM_options_set(zoptions, "sru_version", sru_version);
+
+ value = session_setting_oneval(sdb, PZ_AUTHENTICATION_MODE);
+ if (value && *value)
+ ZOOM_options_set(zoptions, "authenticationMode", value);
+
if (!(con->link = ZOOM_connection_create(zoptions)))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
if (!(con->link = ZOOM_connection_create(zoptions)))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");