@@ -111,6 +111,37 @@ static int wk_postset(_wk *web, wk_client *client,char *varname, char *data, int

 static char *wk_postget(_wk *web, wk_client *client,char *varname, int *isfile);

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

+#ifdef WK_DEBUG_IO

+#define DEBUG_IN_PRE { int sbp=sbuf_count(in);

+#define DEBUG_IN_POST wk_debug_io("READ",fd,sbuf_ptr(in)+sbp,sbuf_count(in)-sbp); }

+#define DEBUG_OUT_PRE { int sbu=out->got;

+#define DEBUG_OUT_POST wk_debug_io("WRITTEN",fd,out->buf+sbu,out->got-sbu); }

+

+static void

+wk_debug_io(char *iotype, int fd, char *ptr, long int size)

+{

+        int n,c;

+        fprintf(stderr,"%s %li bytes on %i:",iotype,size,fd);

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

+                c=((unsigned char *)ptr)[n];

+                if(c=='\r' || c=='\n')

+                        fprintf(stderr,"\\%c",(c=='\r')?'r':'n');

+                else if(c<' ' || c>'~')

+                        fprintf(stderr,"\\x%02X",c);

+                else

+                        fprintf(stderr,"%c",c);

+        }

+        fprintf(stderr,"\n");

+}

+

+#else

+#define DEBUG_IN_PRE

+#define DEBUG_IN_POST

+#define DEBUG_OUT_PRE

+#define DEBUG_OUT_POST

+#endif

+

+

 wk *

 wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *web,int connid, wk_event event, void *userptr*/), wk_action (*callback_http)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), wk_action (*callback_post)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), wk_action (*callback_continuation)(/*wk *web,int connid, wk_uri *uri, void *userptr*/), void *userptr)

 {

@@ -236,13 +267,16 @@ wk_service(wk *paramweb)

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

                         fd=fds[i];

                         if(fd==web->serverfd) {

-                                /* accept new connection */

-                                if((client=wk_accept(web))!=NULL && web->callback_event!=NULL)

-                                        web->callback_event((wk *)web,client->connid,wke_connected,web->userptr);

+                                do {

+                                        /* accept new connection */

+                                        if((client=wk_accept(web))!=NULL && web->callback_event!=NULL)

+                                                web->callback_event((wk *)web,client->connid,wke_connected,web->userptr);

+                                } while(sock_readable(fd)==0);

                                 continue; /* all done here */

                         }

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

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

+                                sselect_delread(web->ssel,fd);

+                                close(fd),fd=-1;

                                 continue; /* internal error */

                         }

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

@@ -255,11 +289,13 @@ wk_service(wk *paramweb)

                                 sselect_delread(web->ssel,fd);

                                 continue;

                         }

+                        DEBUG_IN_PRE;

                         if(sbuf_fill(in,fd,sock_queued(fd))==0) {

                                 /* client has closed connection */

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

                                 continue;

                         }

+                        DEBUG_IN_POST;

                         if(client->status==wkc_header) {

                                 if(wk_clientservicereadheader(web,client)==-1) {

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

@@ -288,7 +324,9 @@ wk_service(wk *paramweb)

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

                                 continue; /* internal error */

                         }

+                        DEBUG_OUT_PRE;

                         sbuf_send(out,fd,sbuf_count(out));

+                        DEBUG_OUT_POST;

                         /* if we are serving from file, load the next chunk */

                         if(client->fdtoserve!=-1 && client->usedoutbufids==1) {

                                 sbuf_discard(out);

@@ -314,8 +352,8 @@ wk_service(wk *paramweb)

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

                                         } else {

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

-                                                if(!client->keepalive)

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

+                                                if(client->keepalive==0)

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

                                         }

                                 }

                         }

@@ -335,7 +373,7 @@ wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const

                 return(-1);

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

                 return(-1);

-        wk_writestr((wk *)web,connid,"HTTP/1.1 200 OK\r\n");

+        wk_writestr((wk *)web,connid,"HTTP/1.0 200 OK\r\n");

         sprintf(buf,"Content-Length: %i\r\n",datalen);

         wk_writestr((wk *)web,connid,buf);

         if(mime!=NULL && strlen(mime)<(sizeof(buf)-sizeof(strcontenttype)-3))

@@ -744,7 +782,7 @@ wk_sbufrelease(wk *paramweb, int sbufid)

                 return(-1);

         numblock=sbufid/BUFBLOCK;

         j=sbufid%BUFBLOCK;

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

+        bit=0x1<<(j&7);

         if((buf=wk_sbufget(web,sbufid))==NULL)

                 return(-1);

         web->bufblocks[numblock].usedbufs--;

@@ -763,7 +801,7 @@ wk_sbufget(wk *paramweb, int sbufid)

                 return(NULL);

         numblock=sbufid/BUFBLOCK;

         j=sbufid%BUFBLOCK;

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

+        bit=0x1<<(j&7);

         if(web==NULL ||

           web->bufblocks==NULL ||

           web->sizebufblocks<=numblock ||

@@ -871,7 +909,7 @@ wk_clientrelease(_wk *web, int connid)

         int w;

         numblock=connid/CLIENTBLOCK;

         j=connid%CLIENTBLOCK;

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

+        bit=0x1<<(j&7);

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

                 return(-1);

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

@@ -893,7 +931,7 @@ wk_clientget(_wk *web, int connid)

         int numblock,j,bit;

         numblock=connid/CLIENTBLOCK;

         j=connid%CLIENTBLOCK;

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

+        bit=0x1<<(j&7);

         if(web==NULL ||

           web->clientblocks==NULL ||

           web->sizeclientblocks<=numblock ||

@@ -974,7 +1012,10 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

         /* headers */

         *end='\0';

         uri->headers=sbuf_ptrunused(hbuf);

-        client->keepalive=0;

+        if(strcmp(uri->protocol,"HTTP/0.9")==0 || strcmp(uri->protocol,"HTTP/1.0")==0)

+                client->keepalive=0;

+        else

+                client->keepalive=1; /* default for http/1.1 */

         while(ptr<end) {

                 if(*ptr!='\n')

                         return(-1); /* line is not ended with \r\n */

@@ -994,6 +1035,8 @@ wk_clientservicereadheader(_wk *web, wk_client *client)

         }

         /* add header terminator */

         sbuf_add(hbuf,"",1);

+        /* mark data as used */

+        sbuf_getbytes(in,end-sbuf_ptr(in)+4);

         /* call the http method */

         client->uriready=1;

         client->continuationactive=0;

@@ -30,6 +30,7 @@ char *socklib_connect(test_action action);

 char *socklib_sselect(test_action action);

 char *sbuf_memory(test_action action);

 char *webkernel_basic(test_action action);

+char *webkernel_dual(test_action action);

 struct {

@@ -39,6 +40,7 @@ struct {

            {socklib_sselect},

            {sbuf_memory},

            {webkernel_basic},

+           {webkernel_dual},

           };

 int

@@ -48,8 +50,10 @@ main(int argc, char *argv[])

         int flagall;

         char *resstr;

         int total,totalfail;

-        if(argc==1 || strcmp(argv[argc-1],"--help")==0 || argc!=2) {

-                printf("Syntax:\n\t%s { --help | --list | test_name | all }\nNOTE: test_name is one of the tests listed in --list\n",argv[0]);

+        int n;

+        char *test;

+        if(argc==1 || strcmp(argv[argc-1],"--help")==0 || argc<2) {

+                printf("Syntax:\n\t%s { --help | --list | all | test_name [ test_name [...]] }\nNOTE: test_name is one of the tests listed in --list\n",argv[0]);

                 return(0);

         }

         if(strcmp(argv[argc-1],"--list")==0) {

@@ -58,8 +62,12 @@ main(int argc, char *argv[])

                 return(0);

         }

         flagall=(strcmp(argv[argc-1],"all")==0)?1:0;

-        for(total=totalfail=0,i=0;i<(sizeof(tests)/sizeof(tests[0]));i++) {

-                if(!flagall && strcmp(tests[i].test(test_name),argv[argc-1])!=0)

+        total=totalfail=0;

+        for(n=(flagall)?0:1;(flagall==0 && n<argc) || (flagall!=0 && n<(sizeof(tests)/sizeof(tests[0])));n++) {

+                test=(flagall!=0)?tests[n].test(test_name):argv[n];

+                for(i=0;i<(sizeof(tests)/sizeof(tests[0])) && strcmp(tests[i].test(test_name),test)!=0;i++)

+                        ;

+                if(i>=(sizeof(tests)/sizeof(tests[0])))

                         continue;

                 printf("%20s...",tests[i].test(test_name));

                 fflush(stdout);

@@ -69,7 +77,7 @@ main(int argc, char *argv[])

                 printf("%s\n",resstr);

         }

-        if(!flagall && i>=(sizeof(tests)/sizeof(tests[0]))) {

+        if(total==0) {

                 printf("ERROR: test not found\n");

                 return(1);

         }

@@ -353,12 +361,17 @@ wk_action

 webkernel_basichttp(wk *web, int connid, wk_uri *uri, void *userptr)

 {

-        *((int *)userptr)=0;

         char reply_ok[]={"Ok"};

+#if 1

+        printf("CALLBACK! (check is %i, 0x%p), uri->path:%s\n",(*((int *)userptr)),(void *)userptr,uri->path);

+#endif

         if(strcmp(uri->path,"/test.cgi")==0) {

-                *((int *)userptr)=1;

+                (*((int *)userptr))=(*((int *)userptr))+1;

                 wk_serve_buffer_as_file(web,connid,reply_ok,sizeof(reply_ok)-1,mime_getdefault("test.txt",NULL));

         }

+#if 1

+        printf("check is now %i\n",(*((int *)userptr)));

+#endif

         return(wkact_finished);

 }

@@ -452,7 +465,7 @@ Connection: keep-alive\r\n\

         /* reply_in_wk -> socket */

         if(sselect_wait(ssel,timeout)!=1) {

                 webkernel_basicclose(&client,&ssel,&host,&web);

-                return(STRING_FAIL ": timeout on sselect_wait (after client request)\n");

+                return(STRING_FAIL ": (2) timeout on sselect_wait (after client request)\n");

         }

         wk_service(web);

         /* client read availability */

@@ -483,3 +496,170 @@ Connection: keep-alive\r\n\

         return(STRING_OK);

 }

+void

+webkernel_dualclose(int *clients,int sizeclients,sselect **ssel, char **host, wk **web)

+{

+        int c;

+        for(c=0;c<sizeclients;c++) {

+                if(clients[c]!=-1)

+                        close(clients[c]),clients[c]=-1;

+        }

+        if(*host!=NULL)

+                free(*host),*host=NULL;

+        if(*web!=NULL)

+                wk_free(*web),*web=NULL;

+        if(*ssel!=NULL)

+                sselect_free(*ssel),*ssel=NULL;

+}

+

+

+char *

+webkernel_dual(test_action action)

+{

+        wk *web;

+        int port;

+        int off;

+        int check;

+        sselect *ssel;

+        int clients[2];

+        int c;

+        char *host;

+        long hostsize;

+        int timeout;

+        int fds[2];

+        char buf[128];

+        int usedbuf;

+        char test_request[]={"\

+GET /test.cgi HTTP/1.0\r\n\

+Host: localhost\r\n\

+Connection: keep-alive\r\n\

+\r\n\

+"};

+        if(action==test_name)

+                return("webkernel_dual");

+        else if(action==test_description)

+                return("webkernel multiple simultaneous connections");

+        for(c=0;c<(sizeof(clients)/sizeof(clients[0]));c++)

+                clients[c]=-1;

+        ssel=NULL;

+        host=NULL;

+        web=NULL;

+        timeout=100;

+        check=0;

+#if 1

+printf("\n");

+#endif

+        if((ssel=sselect_init())==NULL)

+                return(STRING_FAIL ": couln't alloc a sselect structure");

+        for(port=19747,off=0;(web=wk_init(port,ssel,NULL,webkernel_basichttp,NULL,NULL,&check))==NULL;off++,port++)

+                ;

+        if(web==NULL) {

+                webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                return(STRING_FAIL ": couln't find a free port to init webkernel");

+        }

+        if((host=ipv4_genip("localhost",&hostsize))==NULL) {

+                webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                return(STRING_FAIL ": couldn't resove localhost");

+        }

+        for(c=0;c<(sizeof(clients)/sizeof(clients[0]));c++) {

+                if((clients[c]=ipv4_preconnect(host,hostsize,port))==-1) {

+                        webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                        return(STRING_FAIL ": couldn't connect to server\n");

+                }

+                if(ipv4_connect(clients[c],timeout)==-1) {

+                        webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                                return(STRING_FAIL ": timeout on connect\n");

+                }

+                ipv4_postconnect(clients[c]);

+        }

+        /* accept the connection */

+#if 1

+printf("0. fd[0]=%i, fd[1]=%i\n",clients[0],clients[1]);

+#endif

+#if 1

+printf("1. sselect_wait\n");

+#endif

+        if(sselect_wait(ssel,timeout)!=1) {

+                webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                return(STRING_FAIL ": timeout on sselect_wait\n");

+        }

+#if 1

+printf("2. wk_service\n");

+#endif

+        wk_service(web);

+#if 1

+printf("3. sselect_getread\n");

+#endif

+        if(sselect_getread(ssel,fds,sizeof(fds)/sizeof(fds[0]))==1) {

+                webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                return(STRING_FAIL ": wk_service hasn't serviced the server connection\n");

+        }

+        /* client does request into socket */

+#if 1

+printf("4. write\n");

+#endif

+        for(c=0;c<(sizeof(clients)/sizeof(clients[0]));c++)

+                write(clients[c],test_request,sizeof(test_request)-1);

+        /* socket-> callback_http -> reply_in_wk */

+#if 1

+printf("5. sselect_wait\n");

+#endif

+        if(sselect_wait(ssel,timeout)!=2) {

+                webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                return(STRING_FAIL ": timeout on sselect_wait (after client request)\n");

+        }

+#if 1

+printf("6. wk_service\n");

+#endif

+        wk_service(web);

+#if 1

+printf("check is %i\n",check);

+#endif

+        if(check!=2) {

+                webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                return(STRING_FAIL ": http callback was not called\n");

+        }

+        /* reply_in_wk -> socket */

+#if 1

+printf("7. sselect_wait\n");

+#endif

+        if(sselect_wait(ssel,timeout)!=2) {

+                webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                return(STRING_FAIL ": (2) timeout on sselect_wait (after client request)\n");

+        }

+#if 1

+printf("8. wk_service\n");

+#endif

+        wk_service(web);

+        /* client read availability */

+        for(c=0;c<(sizeof(clients)/sizeof(clients[0]));c++)

+                sselect_addread(ssel,clients[c],NULL);

+        if(sselect_wait(ssel,timeout)!=2) {

+                webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                return(STRING_FAIL ": timeout on sselect_wait (to read client reply)\n");

+        }

+        wk_service(web);

+        if(sselect_getread(ssel,fds,sizeof(fds)/sizeof(fds[0]))!=2) {

+                webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                return(STRING_FAIL ": client read not detected\n");

+        }

+        /* read data */

+        for(c=0;c<(sizeof(clients)/sizeof(clients[0]));c++) {

+                if((usedbuf=read(clients[c],buf,sizeof(buf)-1))<0) {

+                        webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                        return(STRING_FAIL ": couldn't read reply\n");

+                }

+                buf[usedbuf]='\0';

+                if(usedbuf<2 || memcmp(buf+usedbuf-2,"Ok",2)!=0) {

+                        webkernel_dualclose(clients,sizeof(clients)/sizeof(clients[0]),&ssel,&host,&web);

+                        return(STRING_FAIL ": corrupted data in read on client\n");

+                }

+        }

+        for(c=0;c<(sizeof(clients)/sizeof(clients[0]));c++)

+                close(clients[c]),clients[c]=-1;

+        wk_free(web),web=NULL;

+        sselect_free(ssel),ssel=NULL;

+        free(host),host=NULL;

+        return(STRING_OK);

+}

+