@@ -202,35 +202,54 @@ callback_http(wk *web, int connid, wk_uri *uri, void *userptr)

         return(wkact_finished);

 }

+

+/* newsl_serve_buffer_with_rootdir() substitutes /~/ with /$rootdir/ */

+/* NOTE: it is limited to webkernel's MAXOUTBUF * BUFSIZE; normally MAXOUTBUF is 128 and BUFSIZE is 8192 (that is, 1MB) */

 int

 newsl_serve_buffer_with_rootdir(newslettersan *newsl, wk *web, int connid, char *data, int datalen, const char *mime)

 {

         int res;

-        sbuf *buf;

-        int sbufid;

+        int newdatalen;

+        int newstrlen;

         char *last,*next,*end;

+        int etagnotmodified;

         if(newsl==NULL || web==NULL || data==NULL || datalen<0)

                 return(-1); /* sanity check failed */

-        if((sbufid=wk_sbufacquire(web))==-1 || (buf=wk_sbufget(web,sbufid))==NULL)

-                return(-1);

-        /* we copy the buffer substituting /~/ for /$rootdir/ */

+        /* we calculate the new datalen */

         end=data+datalen;

+        newstrlen=1+strlen(newsl->config->rootdir)+1;

         for(last=data,next=((last+3)<=end)?memchr(last,'/',end-last-3):NULL;next!=NULL;next=((last+3)<=end)?memchr(last,'/',end-last-3):NULL) {

                 if(memcmp(next,"/~/",3)==0) {

-                        sbuf_add(buf,last,next-last);

-                        sbuf_add(buf,"/",1);

-                        sbuf_addstr(buf,newsl->config->rootdir);

-                        sbuf_add(buf,"/",1);

+                        newdatalen+=next-last+newstrlen;

                         last=next+3;

                 } else {

-                        sbuf_add(buf,last,next-last+1);

+                        newdatalen+=next-last+1;

                         last=next+1;

                 }

         }

-        sbuf_add(buf,last,end-last);

-        /* send the constructed buffer */

-        res=wk_serve_buffer_as_file(web,connid,sbuf_ptr(buf),sbuf_count(buf),mime);

-        wk_sbufrelease(web,sbufid),sbufid=-1,buf=NULL;

-        return(res);

-

+        newdatalen+=end-last;

+        /* serve the headers */

+        res=wk_serve_generic_headers(web,connid,newdatalen,mime,&etagnotmodified);

+        if(res!=0)

+                return(res); /* error in headers */

+        /* serve the contents */

+        if(!etagnotmodified) {

+                /* we copy the buffer substituting /~/ for /$rootdir/ */

+                end=data+datalen;

+                for(last=data,next=((last+3)<=end)?memchr(last,'/',end-last-3):NULL;next!=NULL;next=((last+3)<=end)?memchr(last,'/',end-last-3):NULL) {

+                        if(memcmp(next,"/~/",3)==0) {

+                                wk_write(web,connid,last,next-last);

+                                wk_write(web,connid,"/",1);

+                                wk_writestr(web,connid,newsl->config->rootdir);

+                                wk_write(web,connid,"/",1);

+                                last=next+3;

+                        } else {

+                                wk_write(web,connid,last,next-last+1);

+                                last=next+1;

+                        }

+                }

+                wk_write(web,connid,last,end-last);

+        }

+        return(0);

 }

+