X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp.c;h=5158ddbd1929e0c2b3532b64d1ea6ed043d687b2;hb=d24d65a3a42bbb6e8c8d0f919bf33510dd356a45;hp=0f5da4ea06be9d737a66c5302e84045158b01c28;hpb=07bcab2a08186836333fe62a5ebab348e7c17b0d;p=pazpar2-moved-to-github.git

diff --git a/src/http.c b/src/http.c
index 0f5da4e..5158ddb 100644
--- a/src/http.c
+++ b/src/http.c
@@ -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
@@ -1129,6 +1130,7 @@ static struct http_channel *http_channel_create(http_server_t hs,
     http_server_incref(hs);
     r->http_server = hs;
     r->http_sessions = hs->http_sessions;
+    assert(r->http_sessions);
     r->server = server;
     r->proxy = 0;
     r->iochan = 0;
@@ -1174,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 */
@@ -1246,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;
 }