Merge r1410954 from trunk:

Don't log a spurious "-" if a request has been rejected
before mod_log_forensic could attach its id to it.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693292

Submitted by: sf
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index 2101392401eb84b9e3794771fd26c093e16d6312..f1a024e2ff509c5f15fddfe81103ebe8ffee830d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.4
 
+  *) mod_log_forensic: Don't log a spurious "-" if a request has been rejected
+     before mod_log_forensic could attach its id to it. [Stefan Fritsch]
+
   *) rotatelogs: Omit the second argument for the first invocation of
      a post-rotate program when -p is used, per the documentation.
      [Joe Orton]

diff --git a/STATUS b/STATUS
index f9446a8484deec5c393c51f9abadc071e4caf638..107dc0d32bd8905e879b6a797d4b09deb606ab06 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -97,12 +97,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      documentation patch : http://apache-doc-fr.gryzor.com/fallbackresource_disabled_2.4_doc.patch
      +1: gryzor, covener, sf
 
-    * mod_log_forensic: Don't log spurious "-" characters.
-      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1410954
-      2.4.x patch: trunk patch works (modulo CHANGES)
-      +1: sf, jailletc36, jim
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/loggers/mod_log_forensic.c b/modules/loggers/mod_log_forensic.c
index 7a333dcfd2f75266c01edf8071ae211a5bce2d84..1be123024b04d2c899cb15c7362ef560bd3f12c4 100644 (file)
--- a/modules/loggers/mod_log_forensic.c
+++ b/modules/loggers/mod_log_forensic.c
@@ -240,7 +240,7 @@ static int log_after(request_rec *r)
     apr_size_t l, n;
     apr_status_t rv;
 
-    if (!cfg->fd) {
+    if (!cfg->fd || id == NULL) {
         return DECLINED;
     }