@@ -83,6 +83,8 @@ main(int argc, char *argv[])

         }

         if(totalfail!=0)

                 printf("Failed %i of %i tests.\n",totalfail,total);

+	else

+		printf("Passed %i of %i tests.\n",total,total);

         return((totalfail!=0)?1:0);

 }

@@ -362,16 +364,10 @@ webkernel_basichttp(wk *web, int connid, wk_uri *uri, void *userptr)

 {

         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))=(*((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);

 }

@@ -496,6 +492,7 @@ Connection: keep-alive\r\n\

         return(STRING_OK);

 }

+/* webkernel_dual */

 void

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

 {

@@ -512,7 +509,6 @@ webkernel_dualclose(int *clients,int sizeclients,sselect **ssel, char **host, wk

                 sselect_free(*ssel),*ssel=NULL;

 }

-

 char *

 webkernel_dual(test_action action)

 {

@@ -546,9 +542,6 @@ Connection: keep-alive\r\n\

         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++)

@@ -573,63 +566,33 @@ printf("\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++)