X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=c383cba6e0ba338811970eb33d18bc661e3ff37e;hb=35326727916ab3dcfbf57bc6ab05c31a97aebd74;hp=2685752bbe8737045b17e4f5d85df831b60e231f;hpb=3d7f8cec2fa802808c20361c84585b36e58f40ce;p=pazpar2-moved-to-github.git diff --git a/src/http.c b/src/http.c index 2685752..c383cba 100644 --- a/src/http.c +++ b/src/http.c @@ -63,7 +63,7 @@ typedef int socklen_t; #include #include -#include "pazpar2.h" +#include "session.h" #include "http.h" #define MAX_HTTP_HEADER 4096 @@ -799,7 +799,8 @@ static int http_proxy(struct http_request *rq) // We will add EVENT_OUTPUT below p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT); iochan_setdata(p->iochan, p); - pazpar2_add_channel(p->iochan); + + iochan_add(ser->iochan_man, p->iochan); } // Do _not_ modify Host: header, just checking it's existence @@ -1175,8 +1176,7 @@ static void http_accept(IOCHAN i, int event) server); ch->iochan = c; iochan_setdata(c, ch); - - pazpar2_add_channel(c); + iochan_add(server->iochan_man, c); } /* Create a http-channel listener, syntax [host:]port */ @@ -1247,7 +1247,8 @@ int http_init(const char *addr, struct conf_server *server) c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT); iochan_setdata(c, server); - pazpar2_add_channel(c); + + iochan_add(server->iochan_man, c); return 0; }