From cc208b5c7e3a66a2510e5426713d299ee3be1fbb Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Sat, 9 Nov 2019 21:24:59 +0000 Subject: [PATCH] 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 --- modules/loggers/mod_log_config.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index 609de65a4d6..996c09cf49d 100644 --- 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 { -- 2.47.3