Don't log twice.

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

diff --git a/src/CHANGES b/src/CHANGES
index 7728e1fa73c0ebc6abb75bab777a6b7817cbaf8c..f8f875affa88a3db2524b952b9c1c6581c6e4098 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.30
 
+  *) Forensic logging shouldn't log internal redirects.
+     [Ivan Ristic <ivanr@webkreator.com>]
+
   *) Some syntax errors in mod_mime_magic's magic file can result
      in a 500 error, which previously was unlogged.  Now we log the
      error.  [Jeff Trawick]

diff --git a/src/modules/standard/mod_log_forensic.c b/src/modules/standard/mod_log_forensic.c
index 72416db5cd21c430a3ead2f817562087f9b5b538..a4fa04419dfa9752774bcaf3e9b0f81bba7dfce6 100644 (file)
--- a/src/modules/standard/mod_log_forensic.c
+++ b/src/modules/standard/mod_log_forensic.c
@@ -219,7 +219,7 @@ static int log_before(request_rec *r)
     const char *id;
     hlog h;
 
-    if (cfg->fd < 0)
+    if (cfg->fd < 0 || r->prev)
         return DECLINED;
 
     if (!(id = ap_table_get(r->subprocess_env, "UNIQUE_ID"))) {

diff --git a/src/support/check_forensic b/src/support/check_forensic
index d1512f34cf1d2364094ffa0ed6a58cfe6aabe16f..a3b530917bd9530c5fbede1eebed54c48117148d 100755 (executable)
--- a/src/support/check_forensic
+++ b/src/support/check_forensic
@@ -10,5 +10,6 @@ F=$1
 cut -f 1 -d '|' $F  > /tmp/fc-all.$$
 grep + < /tmp/fc-all.$$ | cut -c2- | sort > /tmp/fc-in.$$
 grep -- - < /tmp/fc-all.$$ | cut -c2- | sort > /tmp/fc-out.$$
+# use -i instead of -I for GNU xargs
 join -v 1 /tmp/fc-in.$$ /tmp/fc-out.$$ | xargs -I xx egrep "^\\+xx" $F
 rm /tmp/fc-all.$$ /tmp/fc-in.$$ /tmp/fc-out.$$