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
poll: add assert for number of FDs; abort on poll failure
[pazpar2-moved-to-github.git]
/
src
/
http.c
diff --git
a/src/http.c
b/src/http.c
index
ee60f8d
..
8a833c0
100644
(file)
--- a/
src/http.c
+++ b/
src/http.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
@@
-840,8
+840,9
@@
void http_send_response(struct http_channel *ch)
struct http_buf *hb;
yaz_timing_stop(ch->yt);
struct http_buf *hb;
yaz_timing_stop(ch->yt);
- yaz_log(YLOG_LOG, "Response: %6.5f %s%s%s",
+ yaz_log(YLOG_LOG, "Response: %6.5f %d %s%s%s ",
yaz_timing_get_real(ch->yt),
yaz_timing_get_real(ch->yt),
+ iochan_getfd(ch->iochan),
ch->request->path,
*ch->request->search ? "?" : "",
ch->request->search);
ch->request->path,
*ch->request->search ? "?" : "",
ch->request->search);
@@
-949,7
+950,9
@@
static void http_io(IOCHAN i, int event)
return;
}
hc->response = 0;
return;
}
hc->response = 0;
- yaz_log(YLOG_LOG, "Request: %s %s%s%s", hc->request->method,
+ yaz_log(YLOG_LOG, "Request: - %d %s %s%s%s",
+ iochan_getfd(i),
+ hc->request->method,
hc->request->path,
*hc->request->search ? "?" : "",
hc->request->search);
hc->request->path,
*hc->request->search ? "?" : "",
hc->request->search);
@@
-1277,7
+1280,7
@@
int http_init(struct conf_server *server, const char *record_fname)
if (s == -1)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "socket");
if (s == -1)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "socket");
- freeaddrinfo(ai);
+ freeaddrinfo(af);
return 1;
}
if (ipv6_only >= 0 && ai->ai_family == AF_INET6 &&
return 1;
}
if (ipv6_only >= 0 && ai->ai_family == AF_INET6 &&
@@
-1285,7
+1288,7
@@
int http_init(struct conf_server *server, const char *record_fname)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "setsockopt IPV6_V6ONLY %s:%s %d",
server->host, server->port, ipv6_only);
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "setsockopt IPV6_V6ONLY %s:%s %d",
server->host, server->port, ipv6_only);
- freeaddrinfo(ai);
+ freeaddrinfo(af);
CLOSESOCKET(s);
return 1;
}
CLOSESOCKET(s);
return 1;
}
@@
-1293,7
+1296,7
@@
int http_init(struct conf_server *server, const char *record_fname)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "setsockopt SO_REUSEADDR %s:%s",
server->host, server->port);
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "setsockopt SO_REUSEADDR %s:%s",
server->host, server->port);
- freeaddrinfo(ai);
+ freeaddrinfo(af);
CLOSESOCKET(s);
return 1;
}
CLOSESOCKET(s);
return 1;
}
@@
-1301,11
+1304,11
@@
int http_init(struct conf_server *server, const char *record_fname)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "bind %s:%s",
server->host, server->port);
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "bind %s:%s",
server->host, server->port);
- freeaddrinfo(ai);
+ freeaddrinfo(af);
CLOSESOCKET(s);
return 1;
}
CLOSESOCKET(s);
return 1;
}
- freeaddrinfo(ai);
+ freeaddrinfo(af);
if (listen(s, SOMAXCONN) < 0)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen %s:%s",
if (listen(s, SOMAXCONN) < 0)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen %s:%s",