Mercurial > hg > webserver / file diff

--- a/src/server/daemon/httplistener.c	Tue Nov 10 21:11:06 2015 +0100
+++ b/src/server/daemon/httplistener.c	Tue Nov 10 21:18:51 2015 +0100
@@ -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;