Fix apr_file_writev when buffering is enabled by forcing a flush, rather than writing underneath the write buffer.

PR: 41197
Submitted By: Davi Arnaut


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@512882 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 12 insertions, 0 deletions

diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c
index 2eb011e82..354641abb 100644
--- a/file_io/os2/readwrite.c
+++ b/file_io/os2/readwrite.c
@@ -197,6 +197,12 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a
 
 APR_DECLARE(apr_status_t) apr_file_writev(apr_file_t *thefile, const struct iovec *vec, apr_size_t nvec, apr_size_t *nbytes)
 {
+    apr_status_t rv = apr_file_flush(thefile);
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
     int bytes;
     if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
         *nbytes = 0;
diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c
index 320735d68..56d9bfff6 100644
--- a/file_io/unix/readwrite.c
+++ b/file_io/unix/readwrite.c
@@ -239,6 +239,12 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a
 APR_DECLARE(apr_status_t) apr_file_writev(apr_file_t *thefile, const struct iovec *vec,
                                           apr_size_t nvec, apr_size_t *nbytes)
 {
+    apr_status_t rv = apr_file_flush(thefile);
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
 #ifdef HAVE_WRITEV
     apr_ssize_t bytes;