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

@@ -51,6 +51,7 @@ wk_uri *wk_geturi(wk *web, int connid); /* for use in callback_event() when wke_

 int wk_service(wk *web); /* To be called after sselelect_wait() but before sselect_getXXX() */

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

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

 int wk_serve_file(wk *web, int connid, char *filename, const char *mime);

 int wk_serve_error(wk *web, int connid, wk_error wkerror);

@@ -64,6 +65,8 @@ char *wk_uri_getheaderbynum(wk_uri *wkuri, int num);

 char *wk_uri_getvar(wk_uri *wkuri, char *varname, int *len);

 char *wk_uri_copyvar(wk_uri *uri, char *varname, char *dest, int destlen);

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

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

 int wk_post_addvalid(wk *web, int connid, char *varname, char *tofile);

 char *wk_post_get(wk *web, int connid, char *varname, int *isfile);