You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2019/11/09 21:24:59 UTC

svn commit: r1869612 - /httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c

Author: jailletc36
Date: Sat Nov  9 21:24:59 2019
New Revision: 1869612

URL: http://svn.apache.org/viewvc?rev=1869612&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c

Modified: httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c?rev=1869612&r1=1869611&r2=1869612&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c (original)
+++ httpd/httpd/branches/2.4.x/modules/loggers/mod_log_config.c Sat Nov  9 21:24:59 2019
@@ -1105,7 +1105,8 @@ static const char *process_item(request_
 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_writ
             s += strl[i];
         }
         w = len;
-        rv = apr_file_write(buf->handle, str, &w);
+        rv = apr_file_write_full(buf->handle, str, w, NULL);
 
     }
     else {