diff -r 8a0a7754f123 -r c93be34fde76 src/server/daemon/httplistener.c --- a/src/server/daemon/httplistener.c Sat Oct 31 20:10:21 2015 +0100 +++ b/src/server/daemon/httplistener.c Mon Nov 02 11:13:38 2015 +0000 @@ -79,7 +79,7 @@ return http_listener_new(conf); } - HttpListener* newls = malloc(sizeof(HttpListener)); + HttpListener* newls = calloc(1, sizeof(HttpListener)); if(newls == NULL) { // TODO: error } @@ -329,6 +329,7 @@ conn->close = connection_ssl_close; } } else { + conn->ssl = NULL; conn->read = connection_read; conn->write = connection_write; conn->close = connection_close;