httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r631359 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS include/ap_mmn.h include/http_core.h modules/loggers/mod_logio.c
Date Tue, 26 Feb 2008 19:47:52 GMT
Author: jim
Date: Tue Feb 26 11:47:51 2008
New Revision: 631359

URL: http://svn.apache.org/viewvc?rev=631359&view=rev
Log:
  * mod_logio: Provide optional function to allow modules to adjust the
      bytes_in count 


Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/include/ap_mmn.h
    httpd/httpd/branches/2.2.x/include/http_core.h
    httpd/httpd/branches/2.2.x/modules/loggers/mod_logio.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=631359&r1=631358&r2=631359&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Feb 26 11:47:51 2008
@@ -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>]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=631359&r1=631358&r2=631359&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Feb 26 11:47:51 2008
@@ -81,17 +81,6 @@
 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

Modified: httpd/httpd/branches/2.2.x/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/ap_mmn.h?rev=631359&r1=631358&r2=631359&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_mmn.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_mmn.h Tue Feb 26 11:47:51 2008
@@ -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

Modified: httpd/httpd/branches/2.2.x/include/http_core.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/http_core.h?rev=631359&r1=631358&r2=631359&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/http_core.h (original)
+++ httpd/httpd/branches/2.2.x/include/http_core.h Tue Feb 26 11:47:51 2008
@@ -672,6 +672,9 @@
 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

Modified: httpd/httpd/branches/2.2.x/modules/loggers/mod_logio.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/loggers/mod_logio.c?rev=631359&r1=631358&r2=631359&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/loggers/mod_logio.c (original)
+++ httpd/httpd/branches/2.2.x/modules/loggers/mod_logio.c Tue Feb 26 11:47:51 2008
@@ -66,6 +66,16 @@
 }
 
 /*
+ * 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 @@
                               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 =



Mime
View raw message