@@ -15,6 +15,7 @@

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

+#include <time.h>

 #include "sbuf.h"

 #include "socklib.h"

 #include "webkernel.h"

@@ -27,6 +28,7 @@

 #define BUFBLOCK 128

 #define BUFBLOCKBLOCK 256

 #define POSTBLOCK 16

+#define ALIVETIMEOUT 15

 typedef struct wk_post {

         char *name;

@@ -62,6 +64,7 @@ typedef struct wk_client {

         wk_post *post;

         int pendingpost;

         int inpostvar;

+        time_t lastio;

 } wk_client;

 typedef struct wk_clientblock {

@@ -98,6 +101,7 @@ typedef struct _wk {

         wk_action (*callback_post)(/*wk *web,int connid, wk_uri *uri, void *userptr*/);

         wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/);

         void *userptr;

+        time_t lasttimeoutcheck;

 } _wk;

 static wk_client *wk_accept(_wk *web);

@@ -256,21 +260,27 @@ wk_service(wk *paramweb)

 {

         int fds[FDBLOCK];

         int fd;

-        int n,i;

+        int n,i,j,k;

         sbuf *in;

         sbuf *out;

         _wk *web=(_wk *)paramweb;

         wk_client *client;

+        wk_clientblock *cb;

+        time_t now;

         if(web==NULL)

                 return(-1);

+        now=time(NULL);

         while((n=sselect_getreadfiltered(web->ssel,&(web->fdset),fds,sizeof(fds)/sizeof(fds[0])))>0) {

                 for(i=0;i<n;i++) {

                         fd=fds[i];

                         if(fd==web->serverfd) {

                                 do {

                                         /* accept new connection */

-                                        if((client=wk_accept(web))!=NULL && web->callback_event!=NULL)

-                                                web->callback_event((wk *)web,client->connid,wke_connected,web->userptr);

+                                        if((client=wk_accept(web))!=NULL) {

+                                                if(web->callback_event!=NULL)

+                                                        web->callback_event((wk *)web,client->connid,wke_connected,web->userptr);

+                                                client->lastio=now;

+                                        }

                                 } while(sock_readable(fd)==0);

                                 continue; /* all done here */

                         }

@@ -296,6 +306,7 @@ wk_service(wk *paramweb)

                                 continue;

                         }

                         DEBUG_IN_POST;

+                        client->lastio=now;

                         if(client->status==wkc_header) {

                                 if(wk_clientservicereadheader(web,client)==-1) {

                                         /* internal error, protocol error or no enough memory */

@@ -325,7 +336,8 @@ wk_service(wk *paramweb)

                                 continue; /* internal error */

                         }

                         DEBUG_OUT_PRE;

-                        sbuf_send(out,fd,sbuf_count(out));

+                        if(sbuf_send(out,fd,sbuf_count(out))>0)

+                                client->lastio=now;

                         DEBUG_OUT_POST;

                         /* if we are serving from file, load the next chunk */

                         if(client->fdtoserve!=-1 && client->usedoutbufids==1) {

@@ -359,6 +371,33 @@ wk_service(wk *paramweb)

                         }

                 }

         }

+        /* timeout check */

+        if(web->lasttimeoutcheck>now)

+                web->lasttimeoutcheck=now; /* fix time warp */

+        if((now-(ALIVETIMEOUT/2))>web->lasttimeoutcheck) {

+                web->lasttimeoutcheck=now;

+                for(i=0;i<web->usedclientblocks;i++) {

+                        cb=web->clientblocks+i;

+                        if(cb->clients==NULL)

+                                continue;

+                        for(j=0;j<cb->sizeclients;j+=8) {

+                                if(cb->acquired[j>>3]==0)

+                                        continue;

+                                for(k=0x1,n=0;n<8;n++,k<<=1) {

+                                        if(!(cb->acquired[j>>3]&k))

+                                                continue;

+                                        client=cb->clients+j+n;

+                                        if(client->fd==-1)

+                                                continue;

+                                        if(client->lastio>now)

+                                                client->lastio=now;

+                                        if((now-ALIVETIMEOUT)>client->lastio)

+                                                wk_close((wk *)web, client->connid); /* timeout */

+                                }

+                        }

+                }

+

+        }

         return(0);

 }

@@ -1028,11 +1067,11 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

                         return(-1); /* header not in format "name: value" */

                 /* check for keepalive header */

                 if(memcmp(ptr,"Connection: ",12)==0) {

-		  if(strcmp(ptr+12,"keep-alive")==0 || strcmp(ptr+12,"Keep-Alive")==0)

+                  if(strcmp(ptr+12,"keep-alive")==0 || strcmp(ptr+12,"Keep-Alive")==0)

                         client->keepalive=1;

                   else if(strcmp(ptr+12,"close")==0 || strcmp(ptr+12,"Close")==0)

                         client->keepalive=0;

-		}

+                }

                 sbuf_add(hbuf,ptr,strlen(ptr)+1);

                 ptr+=strlen(ptr)+1;

         }