projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
YAZ daemon utility relays SIGUSR1 to child process
[yaz-moved-to-github.git]
/
src
/
seshigh.c
diff --git
a/src/seshigh.c
b/src/seshigh.c
index
c2311bb
..
d8142f6
100644
(file)
--- a/
src/seshigh.c
+++ b/
src/seshigh.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-270,11
+270,10
@@
int ir_read(IOCHAN h, int event)
if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask))
{
if ((assoc->cs_put_mask & EVENT_INPUT) == 0 && (event & assoc->cs_get_mask))
{
- yaz_log(YLOG_DEBUG, "ir_session (input)");
/* We aren't speaking to this fellow */
if (assoc->state == ASSOC_DEAD)
{
/* We aren't speaking to this fellow */
if (assoc->state == ASSOC_DEAD)
{
- yaz_log(log_sessiondetail, "Connection closed - end of session");
+ yaz_log(log_session, "Connection closed - end of session");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
@@
-297,8
+296,8
@@
int ir_read(IOCHAN h, int event)
}
else if (res <= 0)
{
}
else if (res <= 0)
{
- yaz_log(log_session, "Connection closed by client");
assoc->state = ASSOC_DEAD;
assoc->state = ASSOC_DEAD;
+ yaz_log(log_session, "Connection closed by client");
return 0;
}
else if (res == 1) /* incomplete read - wait for more */
return 0;
}
else if (res == 1) /* incomplete read - wait for more */
@@
-445,7
+444,6
@@
void ir_session(IOCHAN h, int event)
yaz_log(YLOG_DEBUG, "HTTP out:\n%.*s", req->len_response,
req->response);
#endif
yaz_log(YLOG_DEBUG, "HTTP out:\n%.*s", req->len_response,
req->response);
#endif
- nmem_destroy(req->request_mem);
request_deq(&assoc->outgoing);
request_release(req);
if (!request_head(&assoc->outgoing))
request_deq(&assoc->outgoing);
request_release(req);
if (!request_head(&assoc->outgoing))
@@
-786,7
+784,7
@@
static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct,
if (r == 0)
{
if (*out)
if (r == 0)
{
if (*out)
- yaz_log (log_requestdetail, "srw_sortKeys '%s'", out);
+ yaz_log(log_requestdetail, "srw_sortKeys '%s'", out);
*sortkeys_p = odr_strdup(odr, out);
}
else
*sortkeys_p = odr_strdup(odr, out);
}
else
@@
-2614,7
+2612,7
@@
static Z_APDU *process_searchRequest(association *assoc, request *reqb)
bsrr->extra_args = 0;
bsrr->extra_response_data = 0;
bsrr->extra_args = 0;
bsrr->extra_response_data = 0;
- yaz_log (log_requestdetail, "ResultSet '%s'", req->resultSetName);
+ yaz_log(log_requestdetail, "ResultSet '%s'", req->resultSetName);
if (req->databaseNames)
{
int i;
if (req->databaseNames)
{
int i;