Finalize merge of r1331110 from trunk:

Parts of r1331110 is missing in back-port in 2.4.x done in r1430514.
Add it now.

Submitted by: sf
Reviewed/backported by: jailletc36, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1869612 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 609de65a4d6f98911a9e2c49e38b043487d9388c..996c09cf49d1aa214ceca248b30ed61b4fd78cd9 100644 (file)
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -1105,7 +1105,8 @@ static const char *process_item(request_rec *r, request_rec *orig,
 static void flush_log(buffered_log *buf)
 {
     if (buf->outcnt && buf->handle != NULL) {
-        apr_file_write(buf->handle, buf->outbuf, &buf->outcnt);
+        /* XXX: error handling */
+        apr_file_write_full(buf->handle, buf->outbuf, buf->outcnt, NULL);
         buf->outcnt = 0;
     }
 }
@@ -1716,7 +1717,7 @@ static apr_status_t ap_buffered_log_writer(request_rec *r,
             s += strl[i];
         }
         w = len;
-        rv = apr_file_write(buf->handle, str, &w);
+        rv = apr_file_write_full(buf->handle, str, w, NULL);
 
     }
     else {