[mod_accesslog,mod_rrdtool] HTTP/2 basic accounting

Note: rrdtool counts do not include HTTP/2 protocol overhead.
Continue to count mod_rrdtool per request rather than per connection
so that data is updated after each request, rather than aggregated
to the end of a potentially long-lived connection with many keep-alives.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/mod_rrdtool.c b/src/mod_rrdtool.c
index dfdb0e97..6fd376d0 100644
--- a/src/mod_rrdtool.c
+++ b/src/mod_rrdtool.c
@@ -424,8 +424,14 @@ REQUESTDONE_FUNC(mod_rrd_account) {
     rrd_config * const rrd = p->conf.rrd;
     if (NULL == rrd) return HANDLER_GO_ON;
     ++rrd->requests;
+    if (r->http_version <= HTTP_VERSION_1_1) {
         rrd->bytes_written += (r->con->bytes_written - r->bytes_written_ckpt);
         rrd->bytes_read    += (r->con->bytes_read    - r->bytes_read_ckpt);
+    }
+    else {
+        rrd->bytes_written += r->write_queue->bytes_out;
+        rrd->bytes_read    += r->read_queue->bytes_in;
+    }
 
     return HANDLER_GO_ON;
 }