@@ -24,7 +24,9 @@

 #define CLIENTBLOCK 1024

 #define CLIENTBLOCKBLOCK 256

 #define MAXOUTBUF 128

+#ifndef BUFSIZE

 #define BUFSIZE 8192

+#endif

 #define BUFBLOCK 128

 #define BUFBLOCKBLOCK 256

 #define POSTBLOCK 16

@@ -146,6 +148,12 @@ wk_debug_io(char *iotype, int fd, char *ptr, long int size)

 #define DEBUG_OUT_POST

 #endif

+#ifdef WK_DEBUG_CONN

+#include "loglib.h"

+#define DEBUG_CONN(a) log_write a

+#else

+#define DEBUG_CONN(a)

+#endif

 wk *

 wk_init(int serverfd, 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)

@@ -386,8 +394,10 @@ wk_service(wk *paramweb)

                                                 continue;

                                         if(client->lastio>now)

                                                 client->lastio=now;

-                                        if((now-ALIVETIMEOUT)>client->lastio)

+                                        if((now-ALIVETIMEOUT)>client->lastio) {

+                                                DEBUG_CONN(("WEBK","TIMEOUT: Closing client connection; now:%li, ALIVETIMEOUT:%li, lastio:%li, diff:%li\n",(long)now,(long)ALIVETIMEOUT,(long)client->lastio,(long)(now-client->lastio)));

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

+                                        }

                                 }

                         }

                 }

@@ -637,6 +647,7 @@ wk_close(wk *paramweb, int connid)

                 return(-1);

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

                 return(-1);

+        DEBUG_CONN(("WEBK","wk_close: connid: %i, fd: %i",connid,client->fd));

         if(client->fd!=-1) {

                 sselect_delread(web->ssel,client->fd);

                 sselect_delwrite(web->ssel,client->fd);

@@ -965,6 +976,7 @@ wk_accept(_wk *web)

                 return(NULL);

         }

         client->fd=newfd;

+        DEBUG_CONN(("WEBK","wk_accept: connid: %i, fd: %i",client->connid,client->fd));

         FD_SET(client->fd,&(web->fdset));

         sselect_addread(web->ssel,client->fd,(void *)client);

         return(client);