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 yaz_gettimeofday
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
f95beb1
..
c2c5677
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-451,7
+451,7
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
int client_prep_connection(struct client *cl,
int operation_timeout, int session_timeout,
iochan_man_t iochan_man,
int client_prep_connection(struct client *cl,
int operation_timeout, int session_timeout,
iochan_man_t iochan_man,
- const struct timespec *abstime)
+ const struct timeval *abstime)
{
struct connection *co;
struct host *host = client_get_host(cl);
{
struct connection *co;
struct host *host = client_get_host(cl);
@@
-470,7
+470,7
@@
int client_prep_connection(struct client *cl,
if (!co)
{
if (!co)
{
- int max_connections = 30;
+ int max_connections = 0;
const char *v = session_setting_oneval(client_get_database(cl),
PZ_MAX_CONNECTIONS);
if (v && *v)
const char *v = session_setting_oneval(client_get_database(cl),
PZ_MAX_CONNECTIONS);
if (v && *v)
@@
-504,7
+504,7
@@
int client_prep_connection(struct client *cl,
num_connections);
break;
}
num_connections);
break;
}
- if (num_connections < max_connections)
+ if (max_connections <= 0 || num_connections < max_connections)
{
yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d",
num_connections, max_connections);
{
yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d",
num_connections, max_connections);