@@ -100,6 +100,7 @@ wk_free(wk *paramweb)

         _wk *web=(_wk *)paramweb;

         wk_clientblock *cb;

         wk_client *client;

+        wk_bufblock *bb;

         if(web==NULL)

                 return;

         /* release server fds */

@@ -136,6 +137,19 @@ wk_free(wk *paramweb)

         web->sizeclientblocks=0;

         if(web->clientblocks!=NULL)

                 free(web->clientblocks),web->clientblocks=NULL;

+	/* release the used sbuf */

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

+                bb=web->bufblocks+i;

+                if(bb->bufs==NULL)

+                        continue;

+                bb->usedbufs=0;

+                bb->sizebufs=0;

+                free(bb->bufs),bb->bufs=NULL;

+        }

+        web->usedbufblocks=0;

+        web->sizebufblocks=0;

+        if(web->bufblocks!=NULL)

+                free(web->bufblocks),web->bufblocks=NULL;

         /* free the main struct */

         free(web),web=NULL;

 }

@@ -335,7 +349,7 @@ wk_bufrelease(wk *paramweb, int sbufid)

         sbuf *buf;

         int numblock,j,bit;

         _wk *web=(_wk *)paramweb;

-        if(web==NULL)

+        if(web==NULL || sbufid<0)

                 return(-1);

         numblock=sbufid/BUFBLOCK;

         j=sbufid%BUFBLOCK;

@@ -393,6 +407,7 @@ wk_clientacquire(_wk *web)

         int i,j,k;

         wk_clientblock *cb;

         wk_client *client;

+        int w;

         /* make sure there are free clientblocks */

         if(web->usedclientblocks==web->sizeclientblocks) {

                 wk_clientblock *newcb;

@@ -439,6 +454,17 @@ wk_clientacquire(_wk *web)

         client->web=(wk *)web;

         client->connid=i*CLIENTBLOCK+j;

         client->fd=-1;

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

+                wk_clientrelease(web,client->connid);

+                return(NULL); /* insufficient memory */

+        }

+        for(w=0;w<MAXOUTBUF;w++)

+                client->outbufids[w]=-1;

+        if((client->outbufids[0]=wk_sbufacquire((wk *)web))==-1) {

+                wk_clientrelease(web,client->connid);

+                return(NULL); /* insufficient memory */

+        }

+        client->usedoutbufids=1;

         return(client);

 }

@@ -447,6 +473,7 @@ wk_clientrelease(_wk *web, int connid)

 {

         wk_client *client;

         int numblock,j,bit;

+        int w;

         numblock=connid/CLIENTBLOCK;

         j=connid%CLIENTBLOCK;

         bit=0x1<<(j&3);

@@ -454,6 +481,10 @@ wk_clientrelease(_wk *web, int connid)

                 return(-1);

         web->clientblocks[numblock].usedclients--;

         web->clientblocks[numblock].acquired[j>>3]&=(~bit);

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

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

+        for(w=0;w<client->usedoutbufids;w++) 

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

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

         return(0);

 }