diff -r 1f73302461e0 -r 391ccd490d97 src/server/daemon/sessionhandler.h
--- a/src/server/daemon/sessionhandler.h	Fri Jan 12 18:36:47 2018 +0100
+++ b/src/server/daemon/sessionhandler.h	Sat Jan 13 16:44:05 2018 +0100
@@ -31,6 +31,7 @@
 
 #include "../util/thrpool.h"
 #include "../public/nsapi.h"
+#include "../util/io.h"
 #include "event.h"
 
 #include <openssl/bio.h> 
@@ -72,6 +73,11 @@
      * available
      */
     void(*keep_alive)(SessionHandler*, Connection *conn);
+    
+    /*
+     * Creates an IOStream object for the connection
+     */
+    IOStream*(*create_iostream)(SessionHandler *sh, Connection *conn, pool_handle_t *pool, WSBool *ssl);
 };
 
 /*
@@ -111,6 +117,12 @@
 
 void connection_destroy(Connection *conn);
 
+/*
+ * generic create_iostream function for BasicSessionHandler
+ * and EventSessionHandler
+ */
+IOStream* create_connection_iostream(SessionHandler *sh, Connection *conn, pool_handle_t *pool, WSBool *ssl);
+
 
 SessionHandler* create_basic_session_handler();