From: Jim Jagielski <jim@apache.org>
Date: Tue, 26 Feb 2008 19:47:51 +0000 (+0000)
Subject:   * mod_logio: Provide optional function to allow modules to adjust the
X-Git-Tag: 2.2.9~345
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=047918ac48dbe2a37f8f4db0fdc82c0e8ad9072c;p=thirdparty%2Fapache%2Fhttpd.git

  * mod_logio: Provide optional function to allow modules to adjust the
      bytes_in count



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

diff --git a/CHANGES b/CHANGES
index 907ba02ec01..8b49522deee 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
 
+  *) mod_logio: Provide optional function to allow modules to adjust the 
+     bytes_in count [Eric Covener]
+     
   *) http_filters: Don't returm 100-continue on client error
      PR 43711 [Chetan Reddy <chetanreddy gmail.com>]
 
diff --git a/STATUS b/STATUS
index f83681cc4e1..cedf0533a2e 100644
--- a/STATUS
+++ b/STATUS
@@ -81,17 +81,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_logio: Provide optional function to allow modules to adjust the
-    bytes_in count 
-
-      Trunk version of patch:
-         http://svn.apache.org/viewvc?rev=611199&view=rev
-         http://svn.apache.org/viewvc?rev=611259&view=rev
-         http://svn.apache.org/viewvc?rev=611413&view=rev
-      Backport version of 2.2.x of patch:
-         http://people.apache.org/~covener/2.2.x-logio_subtract_bytes.diff
-    +1 covener, rpluem, jim
-
  * mod_proxy_ftp: fixup base URL for directory listings.
    PR 27834
    http://svn.apache.org/viewvc?rev=611466&view=rev
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 380346b2ba5..7c9a3b05a7d 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -120,6 +120,7 @@
  * 20051115.9 (2.2.7)  Add ap_send_interim_response API
  * 20051115.10(2.2.7)  Added ap_mod_status_reqtail (minor)
  * 20051115.11(2.2.7)  Add *ftp_directory_charset to proxy_dir_conf
+ * 20051115.12(2.2.8) Add optional function ap_logio_add_bytes_in() to mog_logio
  *
  */
 
@@ -128,7 +129,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20051115
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 11                    /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 12                    /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/http_core.h b/include/http_core.h
index 28f2856f726..395ac4214c2 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -672,6 +672,9 @@ AP_DECLARE_HOOK(int, get_mgmt_items,
 APR_DECLARE_OPTIONAL_FN(void, ap_logio_add_bytes_out,
                         (conn_rec *c, apr_off_t bytes));
 
+APR_DECLARE_OPTIONAL_FN(void, ap_logio_add_bytes_in,
+                        (conn_rec *c, apr_off_t bytes));
+
 /* ----------------------------------------------------------------------
  *
  * ident lookups with mod_ident
diff --git a/modules/loggers/mod_logio.c b/modules/loggers/mod_logio.c
index 91db4f6537b..bc4d416c54a 100644
--- a/modules/loggers/mod_logio.c
+++ b/modules/loggers/mod_logio.c
@@ -65,6 +65,16 @@ static void ap_logio_add_bytes_out(conn_rec *c, apr_off_t bytes){
     cf->bytes_out += bytes;
 }
 
+/*
+ * Optional function for modules to adjust bytes_in
+ */
+
+static void ap_logio_add_bytes_in(conn_rec *c, apr_off_t bytes){
+    logio_config_t *cf = ap_get_module_config(c->conn_config, &logio_module);
+
+    cf->bytes_in += bytes;
+}
+
 /*
  * Format items...
  */
@@ -178,6 +188,7 @@ static void register_hooks(apr_pool_t *p)
                               AP_FTYPE_NETWORK - 1);
 
     APR_REGISTER_OPTIONAL_FN(ap_logio_add_bytes_out);
+    APR_REGISTER_OPTIONAL_FN(ap_logio_add_bytes_in);
 }
 
 module AP_MODULE_DECLARE_DATA logio_module =