Fix some bugs with stream

Signed-off-by: Laurent Bercot <ska@appnovation.com>

2 files changed, 9 insertions, 8 deletions

diff --git a/src/tipideed/cgi.c b/src/tipideed/cgi.c
index 1f55500..36d9ee2 100644
--- a/src/tipideed/cgi.c
+++ b/src/tipideed/cgi.c
@@ -350,7 +350,7 @@ static inline int do_cgi (tipidee_rql *rql, char const *docroot, char const *con
     struct iovec v[2] ;
     if (rbodylen)
     {
-      buffer_wpeek(&b, v) ;
+      buffer_rpeek(&b, v) ;
       len = siovec_len(v, 2) ;
       if (len > rbodylen)
       {
@@ -360,22 +360,23 @@ static inline int do_cgi (tipidee_rql *rql, char const *docroot, char const *con
       }
       if (buffer_timed_putv_g(buffer_1, v, 2, &deadline) < len)
         strerr_diefu1sys(111, "write to stdout") ;
+      buffer_rseek(&b, len) ;
       rbodylen -= len ;
     }
     if (!buffer_timed_flush_g(buffer_1, &deadline))
       strerr_diefu1sys(111, "write to stdout") ;
     if (rbodylen) stream_fixed(x[0].fd, rbodylen, argv[0]) ;
   }
-  else if (autochunk)
-    stream_autochunk(&b, argv[0]) ;
+  else if (autochunk) stream_autochunk(&b, argv[0]) ;
   else
   {
     size_t len ;
     struct iovec v[2] ;
-    buffer_wpeek(&b, v) ;
+    buffer_rpeek(&b, v) ;
     len = siovec_len(v, 2) ;
     if (buffer_timed_putv_g(buffer_1, v, 2, &deadline) < len)
       strerr_diefu1sys(111, "write to stdout") ;
+    buffer_rseek(&b, len) ;
     stream_infinite(x[0].fd, argv[0]) ;
   }
 
diff --git a/src/tipideed/stream.c b/src/tipideed/stream.c
index b4d9237..80f73ab 100644
--- a/src/tipideed/stream.c
+++ b/src/tipideed/stream.c
@@ -90,13 +90,13 @@ void stream_fixed (int fd, size_t n, char const *fn)
   size_t r ;
   while (n)
   {
-    buffer_wpeek(buffer_1, v) ;
+    buffer_rpeek(buffer_1, v) ;
     siovec_trunc(v, 2, n) ;
     tain_add_g(&deadline, &g.cgitto) ;
     r = timed_readv_g(fd, v, 2, &deadline) ;
     if (r == -1) strerr_diefu2sys(111, "read from resource ", fn) ;
     if (!r) strerr_dief3x(111, "resource ", fn, " provided less content than advertised in Content-Length") ;
-    buffer_wseek(buffer_1, r) ;
+    buffer_rseek(buffer_1, r) ;
     n -= r ;
     tain_add_g(&deadline, &g.writetto) ;
     if (!buffer_timed_flush_g(buffer_1, &deadline))
@@ -111,12 +111,12 @@ void stream_infinite (int fd, char const *fn)
   size_t r ;
   for (;;)
   {
-    buffer_wpeek(buffer_1, v) ;
+    buffer_rpeek(buffer_1, v) ;
     tain_add_g(&deadline, &g.cgitto) ;
     r = timed_readv_g(fd, v, 2, &deadline) ;
     if (r == -1) strerr_diefu2sys(111, "read from resource ", fn) ;
     if (!r) break ;
-    buffer_wseek(buffer_1, r) ;
+    buffer_rseek(buffer_1, r) ;
     tain_add_g(&deadline, &g.writetto) ;
     if (!buffer_timed_flush_g(buffer_1, &deadline))
       strerr_diefu1sys(111, "write to stdout") ;