@@ -1072,6 +1072,7 @@ wk_accept(_wk *web)

                 return(NULL);

         }

         client->fd=newfd;

+        sock_setsafe(client->fd);

         DEBUG_CONN(("WEBK","wk_accept: connid: %i, fd: %i",client->connid,client->fd));

         FD_SET(client->fd,&(web->fdset));

         sselect_addread(web->ssel,client->fd,(void *)client);

@@ -463,7 +463,7 @@ wk_serve_etagset(wk *paramweb, int connid, char *etag)

 }

 int

-wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const char *mime)

+wk_serve_generic_headers(wk *paramweb, int connid, int datalen, const char *mime, int *etagnotmodified)

 {

         static const char *strcontenttype={"Content-Type: "};

         _wk *web=(_wk *)paramweb;

@@ -476,6 +476,8 @@ wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const

         if((client=wk_clientget(web,connid))==NULL)

                 return(-1);

         cachedetag=(wk_etagnotmodified(web,client)==0)?1:0;

+        if(etagnotmodified!=NULL)

+                *etagnotmodified=cachedetag;

         if(!cachedetag)

                 wk_writestr((wk *)web,connid,"HTTP/1.0 200 OK\r\n");

         else

@@ -505,6 +507,20 @@ wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const

         if(client->keepalive)

                 wk_writestr((wk *)web,connid,"Connection: keep-alive\r\n");

         wk_writestr((wk *)web,connid,"\r\n");

+        return(0);

+}

+

+int

+wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const char *mime)

+{

+        _wk *web=(_wk *)paramweb;

+        int cachedetag;

+        int res;

+        if(web==NULL || datalen<0 || (data==NULL && datalen>0))

+                return(-1);

+        res=wk_serve_generic_headers((wk *)web,connid,datalen,mime,&cachedetag);

+        if(res!=0)

+                return(res);

         if(!cachedetag)

                 return(wk_write((wk *)web,connid,data,datalen));

         return(0);

@@ -1198,6 +1198,7 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

         char *sep;

         wk_uri *uri;

         wk_action action;

+        int flagusepostcallback;

         if((in=wk_sbufget((wk *)web, client->inbufid))==NULL)

                 return(-1); /* internal error */

         /* get memory for the uri data */

@@ -1276,15 +1277,20 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

         sbuf_add(hbuf,"",1);

         /* mark data as used */

         sbuf_getbytes(in,end-sbuf_ptr(in)+4);

-        /* call the http method */

+        /* call the http method if GET (or not post callback) , or the post method if POST */

         client->uriready=1;

         client->continuationactive=0;

-        action=web->callback_http((wk *)web, client->connid, uri, web->userptr);

+        flagusepostcallback=(strcmp(client->uri.method,"POST")==0 && web->callback_post!=NULL)?1:0;

+        if(flagusepostcallback) {

+                action=web->callback_post((wk *)web, client->connid, uri, web->userptr);

+        } else {

+                action=web->callback_http((wk *)web, client->connid, uri, web->userptr);

+        }

         if(action==wkact_continuation) {

                 client->uriready=1;

                 client->continuationactive=1;

                 client->status=wkc_header;

-        } else if(action==wkact_post && web->callback_post!=NULL) {

+        } else if(flagusepostcallback) {

                 char *lenvar;

                 char *contenttype;

                 if(strcmp(client->uri.method,"POST")!=0 ||

@@ -1354,7 +1360,7 @@ wk_clientservicereadpost(_wk *web, wk_client *client)

                         sbuf_getbytes(in,end-start);

                         client->pendingpost-=(end-start);

                 }

-                if(*sep=='&') {

+                if(sep!=NULL && *sep=='&') {

                         sbuf_getbytes(in,1);

                         client->pendingpost--;

                         client->inpostvar=-1;

@@ -1362,14 +1368,14 @@ wk_clientservicereadpost(_wk *web, wk_client *client)

         }

         if(client->pendingpost>0)

                 return(0); /* nothing more to do for now*/

-        /* call the post method */

+        /* call the http method */

         client->uriready=1;

         client->continuationactive=0;

-        action=web->callback_post((wk *)web, client->connid, client->uri, web->userptr);

+        action=web->callback_http((wk *)web, client->connid, &(client->uri), web->userptr);

         if(action==wkact_continuation) {

                 client->uriready=1;

                 client->continuationactive=1;

-                client->status=wkc_header;

+                client->status=wkc_post;

         } else {

                 client->uriready=1;

                 client->continuationactive=0;

@@ -1407,15 +1413,16 @@ wk_postadd(_wk *web, wk_client *client,char *varname, char *tofile)

                 return(-1); /* varname too long */

         }

         post->name=sbuf_ptrunused(buf);

-        sbuf_addstr(buf,varname);

+        sbuf_add(buf,varname,strlen(varname)+1);

         if(tofile!=NULL) {

                 if((strlen(tofile)+1)>(sbuf_unused(buf))) {

                         wk_sbufrelease((wk *)web,post->bufid),post->bufid=-1;

                         return(-1); /* varname+tofile too long */

                 }

                 post->tofile=sbuf_ptrunused(buf);

-                sbuf_addstr(buf,tofile);

+                sbuf_add(buf,tofile,strlen(tofile)+1);

         }

+        client->usedpost++;

         post->value=NULL;

         post->filewritten=0;

         post->valueterminated=0;

@@ -930,10 +930,15 @@ uri_urldecode(char *s)

                         s[o]=' ';

                 else if(s[i]=='%' && (a=s[i+1])!='\0' && (b=s[i+2])!='\0' && ISHEXNIBBLE(a) && ISHEXNIBBLE(b)) {

                         n=(HEXNIBBLE2BIN(a)<<4)|HEXNIBBLE2BIN(b);

-                        s[o]=128|64|(n>>6);

-                        s[o+1]=128|(n&0x3f);

-                        i+=2;

-                        o++;

+                        if(n>=128) {

+                                s[o]=128|64|(n>>6);

+                                s[o+1]=128|(n&0x3f);

+                                i+=2;

+                                o++;

+                        } else {

+                                s[o]=n;

+                                i+=2;

+                        }

                 } else

                         s[o]=s[i];

         }

@@ -33,6 +33,10 @@

 #define ALIVETIMEOUT 15

 #define MAXETAGSIZE 127

+#define HEXNIBBLE2BIN(a) (((a)>='0' && (a)<='9')?(a)-'0':((a)>='a' && (a)<='f')?(a)-'a'+10:((a)>='A' && (a)<='F')?(a)-'A'+10:0)

+#define ISHEXNIBBLE(a) ((((a)>='0' && (a)<='9')||((a)>='a' && (a)<='f')||((a)>='A' && (a)<='F'))?1:0)

+

+

 typedef struct wk_post {

         char *name;

         char *value;

@@ -916,6 +920,28 @@ mime_getdefault(const char *filename, const char *defaultmime)

         return(defaultmime);

 }

+int

+uri_urldecode(char *s)

+{

+        int i,o;

+        int a,b,n;

+        for(i=0,o=0;s[i]!='\0';i++,o++) {

+                if(s[i]=='+')

+                        s[o]=' ';

+                else if(s[i]=='%' && (a=s[i+1])!='\0' && (b=s[i+2])!='\0' && ISHEXNIBBLE(a) && ISHEXNIBBLE(b)) {

+                        n=(HEXNIBBLE2BIN(a)<<4)|HEXNIBBLE2BIN(b);

+                        s[o]=128|64|(n>>6);

+                        s[o+1]=128|(n&0x3f);

+                        i+=2;

+                        o++;

+                } else

+                        s[o]=s[i];

+        }

+        s[o]='\0';

+        return(0);

+}

+

+

 int

 wk_sbufacquire(wk *paramweb)

 {

@@ -31,6 +31,7 @@

 #define BUFBLOCKBLOCK 256

 #define POSTBLOCK 16

 #define ALIVETIMEOUT 15

+#define MAXETAGSIZE 127

 typedef struct wk_post {

         char *name;

@@ -67,6 +68,7 @@ typedef struct wk_client {

         int pendingpost;

         int inpostvar;

         int cookiebufid;

+        char etag[MAXETAGSIZE+1];

         time_t lastio;

 } wk_client;

@@ -117,6 +119,7 @@ static int wk_postadd(_wk *web, wk_client *client,char *varname, char *tofile);

 static int wk_postset(_wk *web, wk_client *client,char *varname, char *data, int datalen);

 static char *wk_postget(_wk *web, wk_client *client,char *varname, int *isfile);

 static int wk_postfree(_wk *web, wk_client *client);

+static int wk_etagnotmodified(_wk *web, wk_client *client);

 #ifdef WK_DEBUG_IO

 #define DEBUG_IN_PRE { int sbp=sbuf_count(in);

@@ -438,6 +441,22 @@ wk_serve_cookieadd(wk *paramweb, int connid, char *cookiename, char *value, char

         return(0);

 }

+int

+wk_serve_etagset(wk *paramweb, int connid, char *etag)

+{

+        _wk *web=(_wk *)paramweb;

+        wk_client *client;

+        if(web==NULL)

+                return(-1);

+        if((client=wk_clientget(web,connid))==NULL)

+                return(-1);

+        if(etag!=NULL) {

+                strncpy(client->etag,etag,sizeof(client->etag));

+                client->etag[sizeof(client->etag)-1]='\0';

+        } else

+                client->etag[0]='\0';

+        return(0);

+}

 int

 wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const char *mime)

@@ -447,28 +466,44 @@ wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const

         wk_client *client;

         char buf[256];

         sbuf *cookiebuf;

+        int cachedetag;

         if(web==NULL)

                 return(-1);

         if((client=wk_clientget(web,connid))==NULL)

                 return(-1);

-        wk_writestr((wk *)web,connid,"HTTP/1.0 200 OK\r\n");

+        cachedetag=(wk_etagnotmodified(web,client)==0)?1:0;

+        if(!cachedetag)

+                wk_writestr((wk *)web,connid,"HTTP/1.0 200 OK\r\n");

+        else

+                wk_writestr((wk *)web,connid,"HTTP/1.1 304 Not modified\r\n");

         if(client->cookiebufid!=-1 && (cookiebuf=wk_sbufget((wk *)web,client->cookiebufid))!=NULL) {

                 if(wk_write((wk *)web,connid,sbuf_getbytes(cookiebuf,sbuf_count(cookiebuf)),sbuf_count(cookiebuf))==-1 ||

                   sbuf_count(cookiebuf)!=0)

                         return(-1); /* insufficient memory */

                 wk_sbufrelease((wk *)web,client->cookiebufid),client->cookiebufid=-1;

         }

-        sprintf(buf,"Content-Length: %i\r\n",datalen);

-        wk_writestr((wk *)web,connid,buf);

-        if(mime!=NULL && strlen(mime)<(sizeof(buf)-sizeof(strcontenttype)-3))

-                sprintf(buf,"%s%s\r\n",strcontenttype,mime);

-        else

-                sprintf(buf,"%s%s\r\n",strcontenttype,"application/octet-stream");

-        wk_writestr((wk *)web,connid,buf);

+        if(!cachedetag) {

+                if(client->etag[0]!='\0') {

+                        sprintf(buf,"ETag: \"%s\"\r\n",client->etag);

+                        client->etag[0]='\0';

+                        wk_writestr((wk *)web,connid,buf);

+                }

+                sprintf(buf,"Content-Length: %i\r\n",datalen);

+                wk_writestr((wk *)web,connid,buf);

+                if(mime!=NULL && strlen(mime)<(sizeof(buf)-sizeof(strcontenttype)-3))

+                        sprintf(buf,"%s%s\r\n",strcontenttype,mime);

+                else

+                        sprintf(buf,"%s%s\r\n",strcontenttype,"application/octet-stream");

+                wk_writestr((wk *)web,connid,buf);

+        } else {

+                wk_writestr((wk *)web,connid,"Content-Length: 0\r\n");

+        }

         if(client->keepalive)

                 wk_writestr((wk *)web,connid,"Connection: keep-alive\r\n");

         wk_writestr((wk *)web,connid,"\r\n");

-        return(wk_write((wk *)web,connid,data,datalen));

+        if(!cachedetag)

+                return(wk_write((wk *)web,connid,data,datalen));

+        return(0);

 }

 int

@@ -480,33 +515,47 @@ wk_serve_file(wk *paramweb, int connid, char *filename, const char *mime)

         char buf[256];

         sbuf *cookiebuf;

         struct stat st;

+        int cachedetag;

         if(web==NULL || filename==NULL)

                 return(-1);

         if((client=wk_clientget(web,connid))==NULL)

                 return(-1);

         if(client->fdtoserve!=-1)

                 close(client->fdtoserve),client->fdtoserve=-1;

-        if((client->fdtoserve=open(filename,O_RDONLY))==-1) {

-                wk_serve_error((wk *)web,connid,wkerr_notfound);

-                return(-1);

-        }

-        wk_writestr((wk *)web,connid,"HTTP/1.1 200 OK\r\n");

+        cachedetag=(wk_etagnotmodified(web,client)==0)?1:0;

+        if(!cachedetag) {

+                if((client->fdtoserve=open(filename,O_RDONLY))==-1) {

+                        wk_serve_error((wk *)web,connid,wkerr_notfound);

+                        return(-1);

+                }

+                wk_writestr((wk *)web,connid,"HTTP/1.0 200 OK\r\n");

+        } else

+                wk_writestr((wk *)web,connid,"HTTP/1.1 304 Not modified\r\n");

         if(client->cookiebufid!=-1 && (cookiebuf=wk_sbufget((wk *)web,client->cookiebufid))!=NULL) {

                 if(wk_write((wk *)web,connid,sbuf_getbytes(cookiebuf,sbuf_count(cookiebuf)),sbuf_count(cookiebuf))==-1 ||

                   sbuf_count(cookiebuf)!=0)

                         return(-1); /* insufficient memory */

                 wk_sbufrelease((wk *)web,client->cookiebufid),client->cookiebufid=-1;

         }

-        if(fstat(client->fdtoserve,&st)==0) {

-                sprintf(buf,"Content-Length: %lld\r\n",(long long)st.st_size);

+        if(!cachedetag) {

+                if(client->etag[0]!='\0') {

+                        sprintf(buf,"ETag: \"%s\"\r\n",client->etag);

+                        client->etag[0]='\0';

+                        wk_writestr((wk *)web,connid,buf);

+                }

+                if(fstat(client->fdtoserve,&st)==0) {

+                        sprintf(buf,"Content-Length: %lld\r\n",(long long)st.st_size);

+                        wk_writestr((wk *)web,connid,buf);

+                } else

+                        client->keepalive=0;

+                if(mime!=NULL && strlen(mime)<(sizeof(buf)-sizeof(strcontenttype)-3))

+                        sprintf(buf,"%s%s\r\n",strcontenttype,mime);

+                else

+                        sprintf(buf,"%s%s\r\n",strcontenttype,"application/octet-stream");

                 wk_writestr((wk *)web,connid,buf);

-        } else

-                client->keepalive=0;

-        if(mime!=NULL && strlen(mime)<(sizeof(buf)-sizeof(strcontenttype)-3))

-                sprintf(buf,"%s%s\r\n",strcontenttype,mime);

-        else

-                sprintf(buf,"%s%s\r\n",strcontenttype,"application/octet-stream");

-        wk_writestr((wk *)web,connid,buf);

+        } else {

+                wk_writestr((wk *)web,connid,"Content-Length: 0\r\n");

+        }

         if(client->keepalive)

                 wk_writestr((wk *)web,connid,"Connection: keep-alive\r\n");

         wk_writestr((wk *)web,connid,"\r\n");

@@ -1051,6 +1100,7 @@ wk_clientacquire(_wk *web)

         client->fdtoserve=-1;

         client->headerbufid=-1;

         client->cookiebufid=-1;

+        client->etag[0]='\0';

         return(client);

 }

@@ -1225,6 +1275,9 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

                 client->uriready=1;

                 client->continuationactive=0;

                 client->status=wkc_header;

+                if(client->cookiebufid!=-1)

+                        wk_sbufrelease((wk *)web,client->cookiebufid),client->cookiebufid=-1;

+                client->etag[0]='\0';

         }

         return(0);

 }

@@ -1431,4 +1484,21 @@ wk_postfree(_wk *web, wk_client *client)

         return(0);

 }

+static int

+wk_etagnotmodified(_wk *web, wk_client *client)

+{

+        char *h;

+        int len;

+        int etaglen;

+        if(client->etag[0]=='\0')

+                return(-1);

+        if((h=wk_uri_getheader(&(client->uri),"If-None-Match",NULL))==NULL)

+                return(-1);

+        etaglen=strlen(client->etag);

+        if((len=strlen(h))<2 || h[0]!='\"' || h[len-1]!='\"')

+                return(-1);

+        if((len-2)!=etaglen || memcmp(h+1,client->etag,etaglen)!=0)

+                return(-1);

+        return(0);

+}

@@ -24,7 +24,9 @@

 #define CLIENTBLOCK 1024

 #define CLIENTBLOCKBLOCK 256

 #define MAXOUTBUF 128

+#ifndef BUFSIZE

 #define BUFSIZE 8192

+#endif

 #define BUFBLOCK 128

 #define BUFBLOCKBLOCK 256

 #define POSTBLOCK 16

@@ -146,6 +148,12 @@ wk_debug_io(char *iotype, int fd, char *ptr, long int size)

 #define DEBUG_OUT_POST

 #endif

+#ifdef WK_DEBUG_CONN

+#include "loglib.h"

+#define DEBUG_CONN(a) log_write a

+#else

+#define DEBUG_CONN(a)

+#endif

 wk *

 wk_init(int serverfd, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), 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)

@@ -386,8 +394,10 @@ wk_service(wk *paramweb)

                                                 continue;

                                         if(client->lastio>now)

                                                 client->lastio=now;

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

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

+                                                DEBUG_CONN(("WEBK","TIMEOUT: Closing client connection; now:%li, ALIVETIMEOUT:%li, lastio:%li, diff:%li\n",(long)now,(long)ALIVETIMEOUT,(long)client->lastio,(long)(now-client->lastio)));

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

+                                        }

                                 }

                         }

                 }

@@ -637,6 +647,7 @@ wk_close(wk *paramweb, int connid)

                 return(-1);

         if((client=wk_clientget(web,connid))==NULL)

                 return(-1);

+        DEBUG_CONN(("WEBK","wk_close: connid: %i, fd: %i",connid,client->fd));

         if(client->fd!=-1) {

                 sselect_delread(web->ssel,client->fd);

                 sselect_delwrite(web->ssel,client->fd);

@@ -965,6 +976,7 @@ wk_accept(_wk *web)

                 return(NULL);

         }

         client->fd=newfd;

+        DEBUG_CONN(("WEBK","wk_accept: connid: %i, fd: %i",client->connid,client->fd));

         FD_SET(client->fd,&(web->fdset));

         sselect_addread(web->ssel,client->fd,(void *)client);

         return(client);

@@ -148,15 +148,15 @@ wk_debug_io(char *iotype, int fd, char *ptr, long int size)

 wk *

-wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), 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)

+wk_init(int serverfd, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), 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)

 {

         _wk *web;

-        if(ssel==NULL || callback_http==NULL)

+        if(ssel==NULL || callback_http==NULL || serverfd==-1)

                 return(NULL);

         if((web=malloc(sizeof(_wk)))==NULL)

                 return(NULL);

         memset(web,0,sizeof(_wk));

-        web->serverfd=-1;

+        web->serverfd=serverfd;

         web->callback_event=callback_event;

         web->callback_http=callback_http;

         web->callback_post=callback_post;

@@ -164,11 +164,6 @@ wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk

         web->userptr=userptr;

         web->ssel=ssel;

         FD_ZERO(&(web->fdset));

-        if((web->serverfd=ipv4_server(port))==-1) {

-                wk_free((wk *)web),web=NULL;

-                return(NULL);

-        }

-        sock_setunsafe(web->serverfd);

         FD_SET(web->serverfd,&(web->fdset));

         sselect_addread(ssel,web->serverfd,NULL);

         if(web->callback_event!=NULL)

@@ -188,11 +183,10 @@ wk_free(wk *paramweb)

                 return;

         if(web->callback_event!=NULL)

                 web->callback_event((wk *)web,-1,wke_fini,web->userptr);

-        /* release server fds */

+        /* unregister the server fd */

         if(web->serverfd!=-1) {

                 sselect_delread(web->ssel,web->serverfd);

                 FD_CLR(web->serverfd,&(web->fdset));

-                close(web->serverfd),web->serverfd=-1;

         }

         /* release client fds and free clients */

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

@@ -665,7 +665,7 @@ wk_uri_getheader(wk_uri *uri, char *header, char *defaultvalue)

         if(uri==NULL || uri->headers==NULL || header==NULL)

                 return(NULL);

         len=strlen(header);

-        for(n=0,ptr=uri->headers;*ptr!='\0';ptr++,n++) {

+        for(n=0,ptr=uri->headers;*ptr!='\0';ptr+=strlen(ptr)+1,n++) {

                 if(memcmp(ptr,header,len)==0 && ptr[len]==':' && ptr[len+1]==' ')

                         return(ptr+len+2);

         }

@@ -679,7 +679,7 @@ wk_uri_getheaderbynum(wk_uri *uri, int num)

         char *ptr;

         if(uri==NULL || uri->headers==NULL)

                 return(NULL);

-        for(n=0,ptr=uri->headers;*ptr!='\0';ptr++,n++) {

+        for(n=0,ptr=uri->headers;*ptr!='\0';ptr+=strlen(ptr)+1,n++) {

                 if(n==num)

                         return(ptr);

         }

@@ -736,7 +736,7 @@ wk_uri_getcookie(wk_uri *uri, char *cookiename, int *len)

         if(uri==NULL || uri->headers==NULL || cookiename==NULL || len==NULL)

                 return(NULL);

         namelen=strlen(cookiename);

-        for(n=0,header=uri->headers;*header!='\0';header++,n++) {

+        for(n=0,header=uri->headers;*header!='\0';header+=strlen(header)+1,n++) {

                 if(memcmp(header,"Cookie: ",8)!=0 && memcmp(header,"cookie: ",8)!=0)

                         continue;

                 for(ptr=header+8;*ptr!='\0';ptr=((*next!='\0')?next+1:next)) {

@@ -764,7 +764,7 @@ wk_uri_getcookie(wk_uri *uri, char *cookiename, int *len)

                                 end--;

                         /* cookie found, return it */

                         *len=end-sep;

-                        return(ptr);

+                        return(sep);

                 }

         }

         return(NULL);

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

         wk_post *post;

         int pendingpost;

         int inpostvar;

+        int cookiebufid;

         time_t lastio;

 } wk_client;

@@ -401,6 +402,39 @@ wk_service(wk *paramweb)

         return(0);

 }

+int

+wk_serve_cookieadd(wk *paramweb, int connid, char *cookiename, char *value, char *domain, int maxage, char *attributes)

+{

+        _wk *web=(_wk *)paramweb;

+        wk_client *client;

+        sbuf *buf;

+        char str[1024];

+        if(web==NULL || cookiename==NULL || (value==NULL && maxage>0))

+                return(-1);

+        if((client=wk_clientget(web,connid))==NULL)

+                return(-1);

+        if(client->cookiebufid==-1) {

+                if((client->cookiebufid=wk_sbufacquire((wk *)web))==-1)

+                        return(-1); /* insufficient memory */

+        }

+        if((buf=wk_sbufget((wk *)web,client->cookiebufid))==NULL)

+                return(-1); /* internal error */

+        if(sbuf_count(buf)==0) {

+                sbuf_addstr(buf,"Cache-control: no-cache=\"set-cookie\"\r\n");

+                sbuf_addstr(buf,"Expires: Tue, 01 Jan 1980 1:00:00 GMT\r\n");

+        }

+        snprintf(str,sizeof(str)-1,"Set-Cookie: %s=%s %s%s%s; Max-Age=%i ; Version=1%s%s\r\n",

+                cookiename,(value!=NULL)?value:"",

+                (domain!=NULL)?"; Domain = ":"",

+                (domain!=NULL && *domain!='.')?".":"",

+                (domain!=NULL)?domain:"",

+                maxage,

+                (attributes!=NULL)?"; ":"",(attributes!=NULL)?attributes:"");

+        sbuf_addstr(buf,str);

+        return(0);

+}

+

+

 int

 wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const char *mime)

 {

@@ -408,11 +442,18 @@ wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const

         _wk *web=(_wk *)paramweb;

         wk_client *client;

         char buf[256];

+        sbuf *cookiebuf;

         if(web==NULL)

                 return(-1);

         if((client=wk_clientget(web,connid))==NULL)

                 return(-1);

         wk_writestr((wk *)web,connid,"HTTP/1.0 200 OK\r\n");

+        if(client->cookiebufid!=-1 && (cookiebuf=wk_sbufget((wk *)web,client->cookiebufid))!=NULL) {

+                if(wk_write((wk *)web,connid,sbuf_getbytes(cookiebuf,sbuf_count(cookiebuf)),sbuf_count(cookiebuf))==-1 ||

+                  sbuf_count(cookiebuf)!=0)

+                        return(-1); /* insufficient memory */

+                wk_sbufrelease((wk *)web,client->cookiebufid),client->cookiebufid=-1;

+        }

         sprintf(buf,"Content-Length: %i\r\n",datalen);

         wk_writestr((wk *)web,connid,buf);

         if(mime!=NULL && strlen(mime)<(sizeof(buf)-sizeof(strcontenttype)-3))

@@ -433,6 +474,7 @@ wk_serve_file(wk *paramweb, int connid, char *filename, const char *mime)

         _wk *web=(_wk *)paramweb;

         wk_client *client;

         char buf[256];

+        sbuf *cookiebuf;

         struct stat st;

         if(web==NULL || filename==NULL)

                 return(-1);

@@ -445,6 +487,12 @@ wk_serve_file(wk *paramweb, int connid, char *filename, const char *mime)

                 return(-1);

         }

         wk_writestr((wk *)web,connid,"HTTP/1.1 200 OK\r\n");

+        if(client->cookiebufid!=-1 && (cookiebuf=wk_sbufget((wk *)web,client->cookiebufid))!=NULL) {

+                if(wk_write((wk *)web,connid,sbuf_getbytes(cookiebuf,sbuf_count(cookiebuf)),sbuf_count(cookiebuf))==-1 ||

+                  sbuf_count(cookiebuf)!=0)

+                        return(-1); /* insufficient memory */

+                wk_sbufrelease((wk *)web,client->cookiebufid),client->cookiebufid=-1;

+        }

         if(fstat(client->fdtoserve,&st)==0) {

                 sprintf(buf,"Content-Length: %lld\r\n",(long long)st.st_size);

                 wk_writestr((wk *)web,connid,buf);

@@ -675,6 +723,65 @@ wk_uri_copyvar(wk_uri *uri, char *varname, char *dest, int destlen)

         return(dest);

 }

+char *

+wk_uri_getcookie(wk_uri *uri, char *cookiename, int *len)

+{

+        int n;

+        char *header;

+        int namelen;

+        char *ptr;

+        char *sep;

+        char *end;

+        char *next;

+        if(uri==NULL || uri->headers==NULL || cookiename==NULL || len==NULL)

+                return(NULL);

+        namelen=strlen(cookiename);

+        for(n=0,header=uri->headers;*header!='\0';header++,n++) {

+                if(memcmp(header,"Cookie: ",8)!=0 && memcmp(header,"cookie: ",8)!=0)

+                        continue;

+                for(ptr=header+8;*ptr!='\0';ptr=((*next!='\0')?next+1:next)) {

+                        /* cookies are separated by ',' or ';' */

+                        next=strchr(ptr,';');

+                        if(next==NULL)

+                                next=ptr+strlen(ptr);

+                        if((sep=strchr(ptr,','))!=NULL && sep<next)

+                                next=sep;

+                        /* trim cookie name */

+                        while(*ptr==' ')

+                                ptr++;

+                        /* check for our cookie and search for the value pos */

+                        if(memcmp(ptr,cookiename,namelen)!=0)

+                                continue; /* not our cookie */

+                        for(sep=ptr+namelen;*sep==' ';sep++)

+                                ;

+                        if(*sep!='=')

+                                continue; /* was partial match or unrecognized cookie format */

+                        /* skip '=' and trim value */

+                        sep++;

+                        while(*sep==' ')

+                                sep++;

+                        for(end=next;end>sep && end[-1]==' ';)

+                                end--;

+                        /* cookie found, return it */

+                        *len=end-sep;

+                        return(ptr);

+                }

+        }

+        return(NULL);

+}

+

+char *

+wk_uri_copycookie(wk_uri *uri, char *cookiename, char *dest, int destlen)

+{

+        char *value;

+        int len;

+        if(dest==NULL || destlen<1 || (value=wk_uri_getcookie(uri,cookiename,&len))==NULL)

+                return(NULL);

+        memcpy(dest,value,(len<(destlen-1))?len:destlen-1);

+        dest[(len<(destlen-1))?len:destlen-1]='\0';

+        return(dest);

+}

+

 int

 wk_post_addvalid(wk *paramweb, int connid, char *varname, char *tofile)

@@ -937,6 +1044,7 @@ wk_clientacquire(_wk *web)

         client->usedoutbufids=1;

         client->fdtoserve=-1;

         client->headerbufid=-1;

+        client->cookiebufid=-1;

         return(client);

 }

@@ -959,6 +1067,8 @@ wk_clientrelease(_wk *web, int connid)

                 wk_sbufrelease((wk *)web,client->outbufids[w]),client->outbufids[w]=-1;

         if(client->headerbufid!=-1)

                 wk_sbufrelease((wk *)web,client->headerbufid),client->headerbufid=-1;

+        if(client->cookiebufid!=-1)

+                wk_sbufrelease((wk *)web,client->cookiebufid),client->cookiebufid=-1;

         wk_postfree(web,client);

         memset(client,0,sizeof(wk_client));

         return(0);

@@ -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;

         }

@@ -1027,9 +1027,12 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

                 if((sep=strchr(ptr,':'))==NULL || sep[1]!=' ')

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

                 /* check for keepalive header */

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

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

+                if(memcmp(ptr,"Connection: ",12)==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;

         }

@@ -111,6 +111,37 @@ static int wk_postset(_wk *web, wk_client *client,char *varname, char *data, int

 static char *wk_postget(_wk *web, wk_client *client,char *varname, int *isfile);

 static int wk_postfree(_wk *web, wk_client *client);

+#ifdef WK_DEBUG_IO

+#define DEBUG_IN_PRE { int sbp=sbuf_count(in);

+#define DEBUG_IN_POST wk_debug_io("READ",fd,sbuf_ptr(in)+sbp,sbuf_count(in)-sbp); }

+#define DEBUG_OUT_PRE { int sbu=out->got;

+#define DEBUG_OUT_POST wk_debug_io("WRITTEN",fd,out->buf+sbu,out->got-sbu); }

+

+static void

+wk_debug_io(char *iotype, int fd, char *ptr, long int size)

+{

+        int n,c;

+        fprintf(stderr,"%s %li bytes on %i:",iotype,size,fd);

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

+                c=((unsigned char *)ptr)[n];

+                if(c=='\r' || c=='\n')

+                        fprintf(stderr,"\\%c",(c=='\r')?'r':'n');

+                else if(c<' ' || c>'~')

+                        fprintf(stderr,"\\x%02X",c);

+                else

+                        fprintf(stderr,"%c",c);

+        }

+        fprintf(stderr,"\n");

+}

+

+#else

+#define DEBUG_IN_PRE

+#define DEBUG_IN_POST

+#define DEBUG_OUT_PRE

+#define DEBUG_OUT_POST

+#endif

+

+

 wk *

 wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), 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)