diff -r 1f73302461e0 -r 391ccd490d97 src/server/daemon/httprequest.c
--- a/src/server/daemon/httprequest.c	Fri Jan 12 18:36:47 2018 +0100
+++ b/src/server/daemon/httprequest.c	Sat Jan 13 16:44:05 2018 +0100
@@ -112,17 +112,11 @@
     sn->connection = request->connection;
     sn->netbuf = request->netbuf;
     sn->sn.pool = pool;
-    //sn->sn.csd = stream_new_from_fd(pool, request->connection->fd);
-    //sn->sn.csd = net_stream_from_fd(pool, request->connection->fd);
-    IOStream *io;
-    if(request->connection->ssl) {
-        io = sslstream_new(pool, request->connection->ssl);
-        sn->sn.ssl = 1;
-    } else {
-        io = sysstream_new(pool, request->connection->fd);
-    }
+    SessionHandler *sh = request->connection->session_handler;
+    WSBool ssl;
+    IOStream *io = sh->create_iostream(sh, request->connection, pool, &ssl);
     sn->sn.csd = httpstream_new(pool, io);
-    
+    sn->sn.ssl = ssl;
     
     sn->sn.client = pblock_create_pool(sn->sn.pool, 8);
     sn->sn.next = NULL;