From: Junio C Hamano Date: Wed, 11 Mar 2009 20:13:38 GMT Subject: Re: [PATCH] Include log_config module in apache.conf Message-ID: <7vhc1z4y31.fsf@gitster.siamese.dyndns.org> In-Reply-To: Brian Gernhardt writes: > On Mar 11, 2009, at 2:58 PM, Junio C Hamano wrote: > >> diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf >> index a0d4077..f460e40 100644 >> --- a/t/lib-httpd/apache.conf >> +++ b/t/lib-httpd/apache.conf >> @@ -4,7 +4,9 @@ DocumentRoot www >> LogFormat "%h %l %u %t \"%r\" %>s %b" common >> CustomLog access.log common >> ErrorLog error.log >> -LoadModule log_config_module modules/mod_log_config.so >> + >> + LoadModule log_config_module modules/mod_log_config.so >> + >> >> >> LoadModule log_config_module modules/mod_log_config.so > > Isn't this last line redundant now? LoadModule log_config_module modules/mod_log_config.so LockFile accept.lock PidFile httpd.pid I think we can lose the first among these three lines safely, but I wonder if we can get rid of the Darwin specific part altogether. -- >8 -- Subject: http tests: Darwin is not that special We have PidFile definition in the file already, and we have added necessary LoadModule for log_config_module recently. This patch will end up giving LockFile to everybody not just limited to Darwin, but why not? Signed-off-by: Junio C Hamano --- t/lib-httpd/apache.conf | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index f460e40..6533c2d 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -1,5 +1,6 @@ ServerName dummy +LockFile accept.lock PidFile httpd.pid DocumentRoot www LogFormat "%h %l %u %t \"%r\" %>s %b" common CustomLog access.log common @@ -8,12 +9,6 @@ ErrorLog error.log LoadModule log_config_module modules/mod_log_config.so - - LoadModule log_config_module modules/mod_log_config.so - LockFile accept.lock - PidFile httpd.pid - - LoadModule ssl_module modules/mod_ssl.so