@@ -204,7 +204,7 @@ wk_service(wk *paramweb)

         wk_client *client;

         if(web==NULL)

                 return(-1);

-        while((n=sselect_getreadfiltered(web,&(web->fdset),fds,sizeof(fds)/sizeof(fds[0])))>0) {

+        while((n=sselect_getreadfiltered(web->ssel,&(web->fdset),fds,sizeof(fds)/sizeof(fds[0])))>0) {

                 for(i=0;i<n;i++) {

                         fd=fds[i];

                         if(fd==web->serverfd) {

@@ -238,7 +238,7 @@ wk_service(wk *paramweb)

                         }

                 }

         }

-        while((n=sselect_getwritefiltered(web,&(web->fdset),fds,sizeof(fds)/sizeof(fds[0])))>0) {

+        while((n=sselect_getwritefiltered(web->ssel,&(web->fdset),fds,sizeof(fds)/sizeof(fds[0])))>0) {

                 for(i=0;i<n;i++) {

                         fd=fds[i];

                         if((client=(wk_client *)sselect_getuserptr(web->ssel,fd))==NULL || client->web!=(wk *)web)

@@ -548,7 +548,7 @@ wk_sbufacquire(wk *paramweb)

         /* make sure there are free bufblocks */

         if(web->usedbufblocks==web->sizebufblocks) {

                 wk_bufblock *newbb;

-                if((newbb=(wk_bufblock *)realloc(web->bufblocks,web->sizebufblocks+BUFBLOCKBLOCK))==NULL)

+                if((newbb=(wk_bufblock *)realloc(web->bufblocks,(web->sizebufblocks+BUFBLOCKBLOCK)*sizeof(wk_bufblock)))==NULL)

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

                 web->bufblocks=newbb;

                 memset(web->bufblocks+web->sizebufblocks,0,BUFBLOCKBLOCK*sizeof(wk_bufblock));

@@ -569,6 +569,7 @@ wk_sbufacquire(wk *paramweb)

                 memset(bb->bufs,0,sizeof(wk_buf)*BUFBLOCK);

                 bb->sizebufs=BUFBLOCK;

                 bb->usedbufs=0;

+                web->usedbufblocks++;

         }

         /* get first unused sbuf */

         for(j=0;j<bb->sizebufs;j+=8) {

@@ -659,7 +660,7 @@ wk_clientacquire(_wk *web)

         /* make sure there are free clientblocks */

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

                 wk_clientblock *newcb;

-                if((newcb=(wk_clientblock *)realloc(web->clientblocks,web->sizeclientblocks+CLIENTBLOCKBLOCK))==NULL)

+                if((newcb=(wk_clientblock *)realloc(web->clientblocks,(web->sizeclientblocks+CLIENTBLOCKBLOCK)*sizeof(wk_clientblock)))==NULL)

                         return(NULL); /* insufficient memory */

                 web->clientblocks=newcb;

                 memset(web->clientblocks+web->sizeclientblocks,0,CLIENTBLOCKBLOCK*sizeof(wk_clientblock));

@@ -680,6 +681,7 @@ wk_clientacquire(_wk *web)

                 memset(cb->clients,0,sizeof(wk_client)*CLIENTBLOCK);

                 cb->sizeclients=CLIENTBLOCK;

                 cb->usedclients=0;

+                web->usedclientblocks++;

         }

         /* get first unused client */

         for(j=0;j<cb->sizeclients;j+=8) {

@@ -762,8 +764,8 @@ str_findfirstempty(char *ptr, int size)

 {

         int i;

         for(i=0;i<(size-3);i++) {

-                if(ptr[0]=='\r' && ptr[1]=='\n' && ptr[2]=='\r' && ptr[3]=='\n')

-                        return(ptr);

+                if(ptr[i+0]=='\r' && ptr[i+1]=='\n' && ptr[i+2]=='\r' && ptr[i+3]=='\n')

+                        return(ptr+i);

         }

         return(NULL);

 }

@@ -819,7 +821,7 @@ wk_clientserviceread(_wk *web, wk_client *client)

         sbuf_add(hbuf,ptr,strlen(ptr)+1);

         ptr+=strlen(ptr)+1;

         /* protocol */

-        uri->path=sbuf_ptrunused(hbuf);

+        uri->protocol=sbuf_ptrunused(hbuf);

         sbuf_add(hbuf,ptr,strlen(ptr)+1);

         ptr+=strlen(ptr)+1;

         /* headers */