X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=1bbd4a1803b060ea42a989f067adacea8a97d90f;hb=0d45377ca625dc66907c18bb3f524f9d6c354236;hp=149fdd06059892cbadee189e15dbc82f9b956604;hpb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index 149fdd0..1bbd4a1 100644 --- a/src/http.c +++ b/src/http.c @@ -655,6 +655,7 @@ static struct http_buf *http_serialize_response(struct http_channel *c, FILE *lf = yaz_log_file(); yaz_log(YLOG_LOG, "Response:"); fwrite(wrbuf_buf(c->wrbuf), 1, wrbuf_len(c->wrbuf), lf); + fputc('\n', lf); } return http_buf_bywrbuf(c->http_server, c->wrbuf); } @@ -840,13 +841,15 @@ void http_send_response(struct http_channel *ch) struct http_buf *hb; yaz_timing_stop(ch->yt); - yaz_log(YLOG_LOG, "Response: %6.5f %d %s%s%s ", - yaz_timing_get_real(ch->yt), - iochan_getfd(ch->iochan), - ch->request->path, - *ch->request->search ? "?" : "", - ch->request->search); - + if (ch->request) + { + yaz_log(YLOG_LOG, "Response: %6.5f %d %s%s%s ", + yaz_timing_get_real(ch->yt), + iochan_getfd(ch->iochan), + ch->request->path, + *ch->request->search ? "?" : "", + ch->request->search); + } assert(rs); hb = http_serialize_response(ch, rs); if (!hb) @@ -1280,7 +1283,7 @@ int http_init(struct conf_server *server, const char *record_fname) 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 && @@ -1288,7 +1291,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); - freeaddrinfo(ai); + freeaddrinfo(af); CLOSESOCKET(s); return 1; } @@ -1296,7 +1299,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); - freeaddrinfo(ai); + freeaddrinfo(af); CLOSESOCKET(s); return 1; } @@ -1304,11 +1307,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); - freeaddrinfo(ai); + freeaddrinfo(af); CLOSESOCKET(s); return 1; } - freeaddrinfo(ai); + freeaddrinfo(af); if (listen(s, SOMAXCONN) < 0) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "listen %s:%s",