You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2012/12/03 10:54:14 UTC
svn commit: r1416406 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
support/rotatelogs.c
Author: jorton
Date: Mon Dec 3 09:54:13 2012
New Revision: 1416406
URL: http://svn.apache.org/viewvc?rev=1416406&view=rev
Log:
Merge 1409726 from trunk:
* support/rotatelogs.c (post_rotate): Really omit the second arg when
invoking a post-rotate program, rather than passing an empty arg.
(Fixes to code match desired&documented behaviour.)
Reviewed by: jorton, jim, sf
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/support/rotatelogs.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1409726
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1416406&r1=1416405&r2=1416406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Dec 3 09:54:13 2012
@@ -2,6 +2,10 @@
Changes with Apache 2.4.4
+ *) rotatelogs: Omit the second argument for the first invocation of
+ a post-rotate program when -p is used, per the documentation.
+ [Joe Orton]
+
*) core: Functions to provide server load values: ap_get_sload() and
ap_get_loadavg(). [Jim Jagielski, Jan Kaluza <jkaluza redhat.com>,
Jeff Trawick]
Modified: httpd/httpd/branches/2.4.x/support/rotatelogs.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/rotatelogs.c?rev=1416406&r1=1416405&r2=1416406&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/rotatelogs.c (original)
+++ httpd/httpd/branches/2.4.x/support/rotatelogs.c Mon Dec 3 09:54:13 2012
@@ -336,7 +336,7 @@ static void post_rotate(apr_pool_t *pool
argv[0] = config->postrotate_prog;
argv[1] = newlog->name;
- if (status->current.name) {
+ if (status->current.fd) {
argv[2] = status->current.name;
argv[3] = NULL;
}