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

@@ -40,7 +40,6 @@ typedef enum wk_error {

 typedef enum wk_action {

         wkact_finished=0,

-        wkact_post,

         wkact_continuation,

 } wk_action;