Mercurial > hg > webserver / file diff

--- a/src/server/daemon/httprequest.c	Thu Dec 29 10:15:43 2016 +0100
+++ b/src/server/daemon/httprequest.c	Fri Dec 30 14:15:52 2016 +0100
@@ -98,10 +98,12 @@
     if(sn == NULL) {
         /* TODO: error */
     }
+    ZERO(sn, sizeof(NSAPISession));
     NSAPIRequest *rq = pool_malloc(pool, sizeof(NSAPIRequest));
     if(rq == NULL) {
         /* TODO: error */
     }
+    ZERO(rq, sizeof(NSAPIRequest));
     rq->rq.req_start = request->req_start;
     rq->phase = NSAPIAuthTrans;
 
@@ -114,6 +116,7 @@
     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);
     }
@@ -677,7 +680,7 @@
 
         // execute directives
         for(int j=NCX_DI(rq);j<dt->ndir;j++) {
-            if(ret == REQ_NOACTION || REQ_PROCEED) {
+            if(ret == REQ_NOACTION || ret == REQ_PROCEED) {
                 directive *d = dt->dirs[j];
                 ret = nsapi_exec(d, sn, rq);
             } else {