@@ -31,8 +31,10 @@

 typedef struct wk_post {

         char *name;

         char *value;

-        int isfile;

+        char *tofile;

+        int bufid;

         int filewritten;

+        int valueterminated;

 } wk_post;

 typedef enum wkc_status {

@@ -59,6 +61,8 @@ typedef struct wk_client {

         int sizepost;

         int usedpost;

         wk_post *post;

+        int pendingpost;

+        int inpostvar;

 } wk_client;

 typedef struct wk_clientblock {

@@ -102,8 +106,9 @@ static wk_client *wk_clientacquire(_wk *web);

 static int wk_clientrelease(_wk *web, int connid);

 static wk_client *wk_clientget(_wk *web, int connid);

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

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

 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 *value);

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

@@ -245,6 +250,7 @@ wk_service(wk *paramweb)

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

                                 continue; /* internal error */

                         }

+                        sbuf_discard(in);

                         if(sbuf_unused(in)<=0) {

                                 /* no room for the new data */

                                 sselect_delread(web->ssel,fd);

@@ -261,8 +267,13 @@ wk_service(wk *paramweb)

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

                                         continue;

                                 }

-                        } else if(client->status==wkc_post) {

-#warning TODO

+                        }

+                        if(client->status==wkc_post) {

+                                if(wk_clientservicereadpost(web,client)==-1) {

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

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

+                                        continue;

+                                }

                         }

                 }

         }

@@ -871,14 +882,15 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

         char *lineend;

         char *sep;

         wk_uri *uri;

+        wk_action action;

         /* check if we have all the headers */

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

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

-        sbuf_discard(in);

         if((end=str_findfirstempty(sbuf_ptr(in),sbuf_count(in)))==NULL) {

+                sbuf_discard(in);

                 if(sbuf_unused(in)==0)

                         return(-1); /* header part too long */

-                /* uncomplete headers, have to wait for more data */

+                /* incomplete headers, have to wait for more data */

                 return(0);

         }

         /* get memory for the uri data */

@@ -942,44 +954,138 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

         /* call the http method */

         client->serviced=1;

         client->continuationactive=0;

-#warning TODO: wkc_post

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

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

+        if(action==wkact_continuation) {

+                client->serviced=1;

+                client->continuationactive=1;

+                client->status=wkc_none;

+        } else if(action==wkact_post) {

+                char *lenvar;

+                char *contenttype;

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

+                  (lenvar=wk_uri_getheader(&(client->uri),"Content-Length",NULL))==NULL) {

+                        return(-1); /* malformed post */

+                }

+                if((contenttype=wk_uri_getheader(&(client->uri),"Content-Type",NULL))==NULL ||

+                  strcmp(contenttype,"application/x-www-form-urlencoded")!=0) {

+                        return(-1); /* unsupported encoding */

+                }

+                while(*lenvar==' ' || *lenvar=='\t')

+                        lenvar++;

+                client->serviced=1;

+                client->continuationactive=0;

+                client->status=wkc_post;

+                client->pendingpost=atoi(lenvar);

+                client->inpostvar=-1;

+        } else {

+                client->serviced=1;

+                client->continuationactive=0;

+                client->status=wkc_none;

+        }

+        return(0);

+}

+

+static int

+wk_clientservicereadpost(_wk *web, wk_client *client)

+{

+        sbuf *in;

+        char *buf;

+        int buflen;

+        char *sep;

+        char *start;

+        char *end;

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

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

+        while(sbuf_count(in)>0) {

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

+                        sbuf_discard(in);

+                        buf=sbuf_ptr(in);

+                        buflen=sbuf_count(in);

+                        if(buflen>client->pendingpost)

+                                buflen=client->pendingpost;

+                        if((sep=memchr(buf,'=',buflen))==NULL)

+                                return(0); /* varname not found */

+                        *sep='\0';

+                        for(client->inpostvar=0;client->inpostvar<client->usedpost;client->inpostvar++) {

+                                if(strcmp(client->post[client->inpostvar].name,buf)==0)

+                                        break;

+                        }

+                        sbuf_getbytes(in,(sep+1)-buf);

+                        client->pendingpost-=((sep+1)-buf);

+                }

+                start=sbuf_ptr(in);

+                end=start+sbuf_count(in);

+                if((end-start)>client->pendingpost)

+                        end=start+client->pendingpost;

+                if((sep=memchr(start,'&',end-start))!=NULL)

+                        end=sep;

+                if(client->inpostvar>=0) {

+                        if(client->inpostvar<client->usedpost)

+                                wk_postset(web,client,client->post[client->inpostvar].name,start,end-start);

+                        sbuf_getbytes(in,end-start);

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

+                }

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

+                        sbuf_getbytes(in,1);

+                        client->pendingpost--;

+                        client->inpostvar=-1;

+                }

+        }

         return(0);

 }

+

 static int

 wk_postadd(_wk *web, wk_client *client,char *varname, char *tofile)

 {

         wk_post *post;

+        sbuf *buf;

+        int i;

         if(client->post==NULL || client->sizepost==client->usedpost) {

                 wk_post *newpost;

                 if((newpost=(wk_post *)realloc(client->post,(client->sizepost+POSTBLOCK)*sizeof(wk_post)))==NULL)

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

                 client->post=newpost;

                 memset(client->post+client->sizepost,0,POSTBLOCK*sizeof(wk_post));

+                for(i=0;i<POSTBLOCK;i++)

+                        client->post[client->sizepost+i].bufid=-1;

                 client->sizepost+=POSTBLOCK;

         }

         post=client->post+client->usedpost;

-        if((post->name=strdup(varname))==NULL)

+        if((post->bufid=wk_sbufacquire((wk *)web))==-1)

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

+        if((buf=wk_sbufget((wk *)web,post->bufid))==NULL) {

+                post->bufid=-1;

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

+        }

+        if((strlen(varname)+1)>(sbuf_unused(buf)-2)) {

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

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

+        }

+        post->name=sbuf_ptrunused(buf);

+        sbuf_addstr(buf,varname);

         if(tofile!=NULL) {

-                if((post->value=strdup(tofile))==NULL) {

-                        free(post->name),post->name=NULL;

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

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

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

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

                 }

-        } else

-                post->isfile=0;

+                post->tofile=sbuf_ptrunused(buf);

+                sbuf_addstr(buf,tofile);

+        }

+        post->value=NULL;

+        post->filewritten=0;

+        post->valueterminated=0;

         return(0);

 }

 static int

-wk_postset(_wk *web, wk_client *client,char *varname, char *value)

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

 {

         int i;

         wk_post *post;

         int fd;

-        int len;

-        if(varname==NULL || value==NULL)

+        sbuf *buf;

+        if(varname==NULL || data==NULL || datalen==0)

                 return(-1);

         for(i=0;i<client->usedpost;i++) {

                 if(strcmp(client->post[i].name,varname)==0)

@@ -988,21 +1094,26 @@ wk_postset(_wk *web, wk_client *client,char *varname, char *value)

         if(i>=client->usedpost)

                 return(-1); /* var not found */

         post=client->post+i;

-        if(post->isfile) {

-                if((fd=open(post->value,O_CREAT|O_APPEND,0600))==-1)

+        if(post->tofile!=NULL) {

+                if((fd=open(post->tofile,O_CREAT|O_APPEND,0600))==-1)

                         return(-1); /* couldn't open file */

-                len=strlen(value);

-                if(write(fd,value,len)!=len) {

+                if(write(fd,data,datalen)!=datalen) {

                         close(fd),fd=-1;

-                        return(-1); /* couldn't open file */

+                        return(-1); /* couldn't write all data */

                 }

                 close(fd),fd=-1;

                 post->filewritten=1;

         } else {

-                if(post->value!=NULL)

-                        free(post->value),post->value=NULL;

-                if((post->value=strdup(value))==NULL)

-                        return(-1);

+                if((buf=wk_sbufget((wk *)web,post->bufid))==NULL) {

+                        post->bufid=-1;

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

+                }

+                if(post->value==NULL)

+                        post->value=sbuf_ptrunused(buf);

+                if(datalen>(sbuf_unused(buf)-1))

+                        datalen=sbuf_unused(buf)-1;

+                sbuf_add(buf,data,datalen);

+                post->valueterminated=0;

         }

         return(0);

 }

@@ -1012,6 +1123,7 @@ wk_postget(_wk *web, wk_client *client,char *varname, int *isfile)

 {

         int i;

         wk_post *post;

+        sbuf *buf;

         if(varname==NULL)

                 return(NULL);

         for(i=0;i<client->usedpost;i++) {

@@ -1021,10 +1133,23 @@ wk_postget(_wk *web, wk_client *client,char *varname, int *isfile)

         if(i>=client->usedpost)

                 return(NULL); /* var not found */

         post=client->post+i;

+        /* file post */

         if(isfile!=NULL)

-                *isfile=post->isfile;

-        if(post->isfile && !post->filewritten)

-                return(NULL);

+                *isfile=(post->tofile!=NULL)?1:0;

+        if(post->tofile) {

+                if(!post->filewritten)

+                        return(NULL);

+                return(post->tofile);

+        }

+        /* buffer post */

+        if((buf=wk_sbufget((wk *)web,post->bufid))==NULL)

+                return(NULL); /* internal error */

+        if(!post->valueterminated) {

+                if(sbuf_unused(buf)<1)

+                        return(NULL); /* internal error */

+                *(sbuf_ptrunused(buf))='\0';

+                post->valueterminated=1;

+        }

         return(post->value);

 }

@@ -1032,12 +1157,11 @@ static int

 wk_postfree(_wk *web, wk_client *client)

 {

         int i;

+        wk_post *post;

         for(i=0;i<client->usedpost;i++) {

-                if(client->post[i].name!=NULL)

-                        free(client->post[i].name),client->post[i].name=NULL;

-                if(client->post[i].value!=NULL)

-                        free(client->post[i].value),client->post[i].value=NULL;

-                client->post[i].isfile=0;

+                post=client->post+i;

+                if(post->bufid!=-1)

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

         }

         if(client->post!=NULL) {

                 client->usedpost=0;