@@ -463,7 +463,7 @@ wk_serve_etagset(wk *paramweb, int connid, char *etag)

 }

 int

-wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const char *mime)

+wk_serve_generic_headers(wk *paramweb, int connid, int datalen, const char *mime, int *etagnotmodified)

 {

         static const char *strcontenttype={"Content-Type: "};

         _wk *web=(_wk *)paramweb;

@@ -476,6 +476,8 @@ wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const

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

                 return(-1);

         cachedetag=(wk_etagnotmodified(web,client)==0)?1:0;

+        if(etagnotmodified!=NULL)

+                *etagnotmodified=cachedetag;

         if(!cachedetag)

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

         else

@@ -505,6 +507,20 @@ wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const

         if(client->keepalive)

                 wk_writestr((wk *)web,connid,"Connection: keep-alive\r\n");

         wk_writestr((wk *)web,connid,"\r\n");

+        return(0);

+}

+

+int

+wk_serve_buffer_as_file(wk *paramweb, int connid, void *data, int datalen, const char *mime)

+{

+        _wk *web=(_wk *)paramweb;

+        int cachedetag;

+        int res;

+        if(web==NULL || datalen<0 || (data==NULL && datalen>0))

+                return(-1);

+        res=wk_serve_generic_headers((wk *)web,connid,datalen,mime,&cachedetag);

+        if(res!=0)

+                return(res);

         if(!cachedetag)

                 return(wk_write((wk *)web,connid,data,datalen));

         return(0);

@@ -52,6 +52,7 @@ int wk_service(wk *web); /* To be called after sselelect_wait() but before ssele

 int wk_serve_cookieadd(wk *web, int connid, char *cookiename, char *value, char *domain, int maxage, char *attributes);

 int wk_serve_etagset(wk *web, int connid, char *etag);

+int wk_serve_generic_headers(wk *web, int connid, int datalen, const char *mime, int *etagnotmodified);

 int wk_serve_buffer_as_file(wk *web, int connid, void *data, int datalen, const char *mime);

 int wk_serve_file(wk *web, int connid, char *filename, const char *mime);

 int wk_serve_error(wk *web, int connid, wk_error wkerror);