httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1416584 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/loggers/mod_log_forensic.c
Date Mon, 03 Dec 2012 16:37:25 GMT
Author: jim
Date: Mon Dec  3 16:37:23 2012
New Revision: 1416584

URL: http://svn.apache.org/viewvc?rev=1416584&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/loggers/mod_log_forensic.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1410954

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1416584&r1=1416583&r2=1416584&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Dec  3 16:37:23 2012
@@ -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]

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1416584&r1=1416583&r2=1416584&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Dec  3 16:37:23 2012
@@ -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 ]
 

Modified: httpd/httpd/branches/2.4.x/modules/loggers/mod_log_forensic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/loggers/mod_log_forensic.c?rev=1416584&r1=1416583&r2=1416584&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/loggers/mod_log_forensic.c (original)
+++ httpd/httpd/branches/2.4.x/modules/loggers/mod_log_forensic.c Mon Dec  3 16:37:23 2012
@@ -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;
     }
 



Mime
View raw message