Make sure to flush before stream_fixed

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

2 files changed, 17 insertions, 21 deletions

diff --git a/src/tipideed/cgi.c b/src/tipideed/cgi.c
index 7954ac9..1f55500 100644
--- a/src/tipideed/cgi.c
+++ b/src/tipideed/cgi.c
@@ -362,12 +362,9 @@ static inline int do_cgi (tipidee_rql *rql, char const *docroot, char const *con
         strerr_diefu1sys(111, "write to stdout") ;
       rbodylen -= len ;
     }
-    if (!rbodylen)
-    {
-      close(x[0].fd) ;
-      return 0 ;
-    }
-    stream_fixed(x[0].fd, rbodylen, argv[0]) ;
+    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]) ;
diff --git a/src/tipideed/stream.c b/src/tipideed/stream.c
index c391631..b4d9237 100644
--- a/src/tipideed/stream.c
+++ b/src/tipideed/stream.c
@@ -88,21 +88,20 @@ void stream_fixed (int fd, size_t n, char const *fn)
   tain deadline ;
   struct iovec v[2] ;
   size_t r ;
-  if (!n) goto flushit ;
- fillit:
-  buffer_wpeek(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) ;
-  n -= r ;
- flushit:
-  tain_add_g(&deadline, &g.writetto) ;
-  if (!buffer_timed_flush_g(buffer_1, &deadline))
-    strerr_diefu1sys(111, "write to stdout") ;
-  if (n) goto fillit ;
+  while (n)
+  {
+    buffer_wpeek(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) ;
+    n -= r ;
+    tain_add_g(&deadline, &g.writetto) ;
+    if (!buffer_timed_flush_g(buffer_1, &deadline))
+      strerr_diefu1sys(111, "write to stdout") ;
+  }
 }
 
 void stream_infinite (int fd, char const *fn)