From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 25 Aug 2013 21:43:42 +0000 (+0000)
Subject: Use %S instead of %C which already in use
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ae65d16c2711051d4de973a66f440b5633295e6;p=thirdparty%2Fapache%2Fhttpd.git

Use %S instead of %C which already in use

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1517386 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml
index a1f88ba0ab9..a503aa52da0 100644
--- a/docs/manual/mod/mod_log_config.xml
+++ b/docs/manual/mod/mod_log_config.xml
@@ -256,7 +256,7 @@
         <td>Bytes sent, including headers. Cannot be zero. You need to
         enable <module>mod_logio</module> to use this.</td></tr>
 
-    <tr><td><code>%C</code></td>
+    <tr><td><code>%S</code></td>
         <td>Bytes transferred (received and sent), including request and headers,
         cannot be zero. This is the combination of %I and %O. You need to
         enable <module>mod_logio</module> to use this.</td></tr>
diff --git a/docs/manual/mod/mod_logio.xml b/docs/manual/mod/mod_logio.xml
index 7accb1ae38f..e7acb129403 100644
--- a/docs/manual/mod/mod_logio.xml
+++ b/docs/manual/mod/mod_logio.xml
@@ -68,7 +68,7 @@
     <tr><td><code>%O</code></td>
         <td>Bytes sent, including headers, cannot be zero.</td></tr>
 
-    <tr><td><code>%C</code></td>
+    <tr><td><code>%S</code></td>
         <td>Bytes transferred (received and sent), including request and headers,
         cannot be zero. This is the combination of %I and %O.</td></tr>
     </table>
diff --git a/modules/loggers/mod_logio.c b/modules/loggers/mod_logio.c
index c0ae7a11c63..ad387a9b1b6 100644
--- a/modules/loggers/mod_logio.c
+++ b/modules/loggers/mod_logio.c
@@ -15,15 +15,7 @@
  */
 
 /*
- * Written by Bojan Smojver <bojan rexursive.com>:
- *
- * The argument to LogFormat and CustomLog is a string, which can include
- * literal characters copied into the log files, and '%' directives as
- * follows:
- *
- * %...I:  bytes received, including request and headers, cannot be zero
- * %...O:  bytes sent, including headers, cannot be zero
- *
+ * Written by Bojan Smojver <bojan rexursive.com>.
  */
 
 #include "apr_strings.h"
@@ -178,7 +170,7 @@ static int logio_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp)
     if (log_pfn_register) {
         log_pfn_register(p, "I", log_bytes_in, 0);
         log_pfn_register(p, "O", log_bytes_out, 0);
-        log_pfn_register(p, "C", log_bytes_combined, 0);
+        log_pfn_register(p, "S", log_bytes_combined, 0);
     }
 
     return OK;