@@ -40,7 +40,6 @@ typedef struct wk_post {

 typedef enum wkc_status {

         wkc_header=0,

         wkc_post,

-        wkc_none,

 } wkc_status;

 typedef struct wk_client {

@@ -51,13 +50,13 @@ typedef struct wk_client {

         int sizeoutbufids;

         int usedoutbufids;

         int outbufids[MAXOUTBUF];

-        wkc_status status;

-        int serviced;

-        int continuationactive;

-        int fdtoserve;

+        int uriready;

         wk_uri uri;

         int headerbufid;

+        wkc_status status;

         int keepalive;

+        int continuationactive;

+        int fdtoserve;

         int sizepost;

         int usedpost;

         wk_post *post;

@@ -216,7 +215,7 @@ wk_geturi(wk *paramweb, int connid)

                 return(NULL);

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

                 return(NULL);

-        if(client->serviced==0)

+        if(client->uriready==0)

                 return(NULL);

         return(&(client->uri));

 }

@@ -314,7 +313,7 @@ wk_service(wk *paramweb)

                                         if(client->continuationactive && web->callback_continuation!=NULL) {

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

                                         } else {

-                                                client->serviced=0; /* we have finished servicing this one */

+                                                client->uriready=0; /* we have finished servicing this one */

                                                 if(!client->keepalive)

                                                         wk_close((wk *)web, fd); /* all sent */

                                         }

@@ -886,16 +885,8 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

         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 */

-        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 */

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

-                return(0);

-        }

         /* get memory for the uri data */

         if(client->headerbufid!=-1)

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

@@ -903,7 +894,17 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

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

         if((hbuf=wk_sbufget((wk *)web,client->headerbufid))==NULL)

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

+        /* check if we have all the headers */

+        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 */

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

+                return(0);

+        }

         /* prepare to fill the uri struct */

+        client->uriready=0;

+        sbuf_wipe(hbuf);

         uri=&(client->uri);

         memset(uri,0,sizeof(wk_uri));

         /* check that the method is supported */

@@ -955,13 +956,13 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

         /* add header terminator */

         sbuf_add(hbuf,"",1);

         /* call the http method */

-        client->serviced=1;

+        client->uriready=1;

         client->continuationactive=0;

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

         if(action==wkact_continuation) {

-                client->serviced=1;

+                client->uriready=1;

                 client->continuationactive=1;

-                client->status=wkc_none;

+                client->status=wkc_header;

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

                 char *lenvar;

                 char *contenttype;

@@ -975,15 +976,15 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

                 }

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

                         lenvar++;

-                client->serviced=1;

+                client->uriready=1;

                 client->continuationactive=0;

                 client->status=wkc_post;

                 client->pendingpost=atoi(lenvar);

                 client->inpostvar=-1;

         } else {

-                client->serviced=1;

+                client->uriready=1;

                 client->continuationactive=0;

-                client->status=wkc_none;

+                client->status=wkc_header;

         }

         return(0);

 }

@@ -1038,17 +1039,17 @@ wk_clientservicereadpost(_wk *web, wk_client *client)

         if(client->pendingpost>0)

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

         /* call the post method */

-        client->serviced=1;

+        client->uriready=1;

         client->continuationactive=0;

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

         if(action==wkact_continuation) {

-                client->serviced=1;

+                client->uriready=1;

                 client->continuationactive=1;

-                client->status=wkc_none;

+                client->status=wkc_header;

         } else {

-                client->serviced=1;

+                client->uriready=1;

                 client->continuationactive=0;

-                client->status=wkc_none;

+                client->status=wkc_header;

         }

         return(0);

 }