Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1408743 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
 STATUS
 server/log.c
Date: Tue, 13 Nov 2012 14:21:35 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
Message-Id: <20121113142136.07F1D23888EA@eris.apache.org>

Author: jim
Date: Tue Nov 13 14:21:34 2012
New Revision: 1408743

URL: http://svn.apache.org/viewvc?rev=1408743&view=rev
Log:
Merge r1399708 from trunk:

only write the first len chars to syslog, as the buffer may have additional
text added speculatively

Submitted by: trawick
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/server/log.c

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

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1408743&r1=1408742&r2=1408743&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Nov 13 14:21:34 2012
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.4
  
+  *) syslog logging: Remove stray ", referer" at the end of some messages.
+     [Jeff Trawick]
+
   *) "Iterate" directives: Report an error if no arguments are provided.
      [Jeff Trawick]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1408743&r1=1408742&r2=1408743&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Nov 13 14:21:34 2012
@@ -90,11 +90,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-   * syslog logging: Remove stray ", referer" at the end of some messages.
-     trunk patch: http://svn.apache.org/viewvc?rev=1399708&view=rev
-     2.4.x patch: trunk patch works:
-     +1: trawick, jim, jailletc36
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

Modified: httpd/httpd/branches/2.4.x/server/log.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/log.c?rev=1408743&r1=1408742&r2=1408743&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/log.c (original)
+++ httpd/httpd/branches/2.4.x/server/log.c Tue Nov 13 14:21:34 2012
@@ -1087,7 +1087,8 @@ static void write_logline(char *errstr, 
     }
 #ifdef HAVE_SYSLOG
     else {
-        syslog(level < LOG_PRIMASK ? level : APLOG_DEBUG, "%s", errstr);
+        syslog(level < LOG_PRIMASK ? level : APLOG_DEBUG, "%.*s",
+               (int)len, errstr);
     }
 #endif
 }