{"thread":{"id":"18259","subject":"[PATCH] Include log_config module in apache.conf","startedAt":"2009-03-11T03:23:45Z","lastAt":"2009-03-11T22:43:12Z","messageCount":8,"participants":["Daniel Barkalow","Johannes Schindelin","Junio C Hamano","Brian Gernhardt","Jay Soffian"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"107634","messageId":"alpine.LNX.1.00.0903102320170.19665@iabervon.org","threadId":"18259","inReplyTo":null,"subject":"[PATCH] Include log_config module in apache.conf","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2009-03-11T03:23:45Z","receivedAt":"2009-03-11T03:23:45Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"The log_config module is needed for at least some versions of apache to \nsupport the LogFormat directive.\n\nSigned-off-by: Daniel Barkalow <barkalow@iabervon.org>\n---\nJohannes, you added the LogFormat line without this; does the test still \nwork for you with this added, or do we need something clever to decide \nwhether the module needs to be loaded or needs to not be loaded?\n\n t/lib-httpd/apache.conf |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf\nindex af6e5e1..a0d4077 100644\n--- a/t/lib-httpd/apache.conf\n+++ b/t/lib-httpd/apache.conf\n@@ -4,6 +4,7 @@ DocumentRoot www\n LogFormat \"%h %l %u %t \\\"%r\\\" %>s %b\" common\n CustomLog access.log common\n ErrorLog error.log\n+LoadModule log_config_module modules/mod_log_config.so\n \n <IfDefine Darwin>\n \tLoadModule log_config_module modules/mod_log_config.so\n-- \n1.6.2.77.g8cc3f.dirty\n"},{"id":"107670","messageId":"alpine.DEB.1.00.0903111240150.10279@pacific.mpi-cbg.de","threadId":"18259","inReplyTo":"alpine.LNX.1.00.0903102320170.19665@iabervon.org","subject":"Re: [PATCH] Include log_config module in apache.conf","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-03-11T11:46:23Z","receivedAt":"2009-03-11T11:46:23Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 10 Mar 2009, Daniel Barkalow wrote:\n\n> The log_config module is needed for at least some versions of apache to \n> support the LogFormat directive.\n> \n> Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>\n> ---\n> Johannes, you added the LogFormat line without this; does the test still \n> work for you with this added, or do we need something clever to decide \n> whether the module needs to be loaded or needs to not be loaded?\n\nSorry, no:\n\n-- snip --\napache2: Syntax error on line 7 of \n/home/schindelin/git/t/lib-httpd/apache.conf: module log_config_module is \nbuilt-in and can't be loaded\n-- snap --\n\nCiao,\nDscho\n"},{"id":"107671","messageId":"alpine.DEB.1.00.0903111246390.10279@pacific.mpi-cbg.de","threadId":"18259","inReplyTo":"alpine.DEB.1.00.0903111240150.10279@pacific.mpi-cbg.de","subject":"[PATCH v2] Include log_config module in apache.conf","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-03-11T11:47:06Z","receivedAt":"2009-03-11T11:47:06Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Daniel Barkalow <barkalow@iabervon.org>\n\nThe log_config module is needed for at least some versions of apache to\nsupport the LogFormat directive.\n\nSigned-off-by: Daniel Barkalow <barkalow@iabervon.org>\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n\n\tThis one works.\n\n t/lib-httpd/apache.conf |    3 +++\n 1 files changed, 3 insertions(+), 0 deletions(-)\n\ndiff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf\nindex af6e5e1..f460e40 100644\n--- a/t/lib-httpd/apache.conf\n+++ b/t/lib-httpd/apache.conf\n@@ -4,6 +4,9 @@ DocumentRoot www\n LogFormat \"%h %l %u %t \\\"%r\\\" %>s %b\" common\n CustomLog access.log common\n ErrorLog error.log\n+<IfModule !mod_log_config.c>\n+\tLoadModule log_config_module modules/mod_log_config.so\n+</IfModule>\n \n <IfDefine Darwin>\n \tLoadModule log_config_module modules/mod_log_config.so\n-- \n1.6.2.363.g9793e\n"},{"id":"107723","messageId":"7vab7r6g59.fsf@gitster.siamese.dyndns.org","threadId":"18259","inReplyTo":"alpine.DEB.1.00.0903111240150.10279@pacific.mpi-cbg.de","subject":"Re: [PATCH] Include log_config module in apache.conf","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-11T18:58:10Z","receivedAt":"2009-03-11T18:58:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> Sorry, no:\n>\n> -- snip --\n> apache2: Syntax error on line 7 of \n> /home/schindelin/git/t/lib-httpd/apache.conf: module log_config_module is \n> built-in and can't be loaded\n> -- snap --\n\nSorry and thanks---I'll apply an interdiff and credit it to you.\n\n-- >8 --\nFrom: Johannes Schindelin <Johannes.Schindelin@gmx.de>\nDate: Wed, 11 Mar 2009 12:47:06 +0100 (CET)\nSubject: [PATCH] test: do not LoadModule log_config_module unconditionally\n\nLoadModule directive for log_config_module will not work if the module is\nbuilt-in.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/lib-httpd/apache.conf |    4 +++-\n 1 files changed, 3 insertions(+), 1 deletions(-)\n\ndiff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf\nindex a0d4077..f460e40 100644\n--- a/t/lib-httpd/apache.conf\n+++ b/t/lib-httpd/apache.conf\n@@ -4,7 +4,9 @@ DocumentRoot www\n LogFormat \"%h %l %u %t \\\"%r\\\" %>s %b\" common\n CustomLog access.log common\n ErrorLog error.log\n-LoadModule log_config_module modules/mod_log_config.so\n+<IfModule !mod_log_config.c>\n+\tLoadModule log_config_module modules/mod_log_config.so\n+</IfModule>\n \n <IfDefine Darwin>\n \tLoadModule log_config_module modules/mod_log_config.so\n-- \n"},{"id":"107726","messageId":"E7E9DDFD-F8F6-4B39-A3E3-48CC1C8F5BBC@silverinsanity.com","threadId":"18259","inReplyTo":"7vab7r6g59.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Include log_config module in apache.conf","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2009-03-11T19:33:27Z","receivedAt":"2009-03-11T19:33:27Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"\nOn Mar 11, 2009, at 2:58 PM, Junio C Hamano wrote:\n\n> diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf\n> index a0d4077..f460e40 100644\n> --- a/t/lib-httpd/apache.conf\n> +++ b/t/lib-httpd/apache.conf\n> @@ -4,7 +4,9 @@ DocumentRoot www\n> LogFormat \"%h %l %u %t \\\"%r\\\" %>s %b\" common\n> CustomLog access.log common\n> ErrorLog error.log\n> -LoadModule log_config_module modules/mod_log_config.so\n> +<IfModule !mod_log_config.c>\n> +\tLoadModule log_config_module modules/mod_log_config.so\n> +</IfModule>\n>\n> <IfDefine Darwin>\n> \tLoadModule log_config_module modules/mod_log_config.so\n\nIsn't this last line redundant now?\n"},{"id":"107728","messageId":"alpine.DEB.1.00.0903112044440.10279@pacific.mpi-cbg.de","threadId":"18259","inReplyTo":"7vab7r6g59.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Include log_config module in apache.conf","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-03-11T19:45:03Z","receivedAt":"2009-03-11T19:45:03Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 11 Mar 2009, Junio C Hamano wrote:\n\n> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n> \n> > Sorry, no:\n> >\n> > -- snip --\n> > apache2: Syntax error on line 7 of \n> > /home/schindelin/git/t/lib-httpd/apache.conf: module log_config_module is \n> > built-in and can't be loaded\n> > -- snap --\n> \n> Sorry and thanks---I'll apply an interdiff and credit it to you.\n\nThanks...\n\nCiao,\nDscho\n"},{"id":"107733","messageId":"7vhc1z4y31.fsf@gitster.siamese.dyndns.org","threadId":"18259","inReplyTo":"E7E9DDFD-F8F6-4B39-A3E3-48CC1C8F5BBC@silverinsanity.com","subject":"Re: [PATCH] Include log_config module in apache.conf","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-11T20:13:38Z","receivedAt":"2009-03-11T20:13:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brian Gernhardt <benji@silverinsanity.com> writes:\n\n> On Mar 11, 2009, at 2:58 PM, Junio C Hamano wrote:\n>\n>> diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf\n>> index a0d4077..f460e40 100644\n>> --- a/t/lib-httpd/apache.conf\n>> +++ b/t/lib-httpd/apache.conf\n>> @@ -4,7 +4,9 @@ DocumentRoot www\n>> LogFormat \"%h %l %u %t \\\"%r\\\" %>s %b\" common\n>> CustomLog access.log common\n>> ErrorLog error.log\n>> -LoadModule log_config_module modules/mod_log_config.so\n>> +<IfModule !mod_log_config.c>\n>> +\tLoadModule log_config_module modules/mod_log_config.so\n>> +</IfModule>\n>>\n>> <IfDefine Darwin>\n>> \tLoadModule log_config_module modules/mod_log_config.so\n>\n> Isn't this last line redundant now?\n\n<IfDefine Darwin>\n\tLoadModule log_config_module modules/mod_log_config.so\n\tLockFile accept.lock\n\tPidFile httpd.pid\n</IfDefine>\n\nI think we can lose the first among these three lines safely, but I wonder \nif we can get rid of the Darwin specific part altogether.\n\n-- >8 --\nSubject: http tests: Darwin is not that special\n\nWe have PidFile definition in the file already, and we have added\nnecessary LoadModule for log_config_module recently.\n\nThis patch will end up giving LockFile to everybody not just limited to\nDarwin, but why not?\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/lib-httpd/apache.conf |    7 +------\n 1 files changed, 1 insertions(+), 6 deletions(-)\n\ndiff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf\nindex f460e40..6533c2d 100644\n--- a/t/lib-httpd/apache.conf\n+++ b/t/lib-httpd/apache.conf\n@@ -1,5 +1,6 @@\n ServerName dummy\n+LockFile accept.lock\n PidFile httpd.pid\n DocumentRoot www\n LogFormat \"%h %l %u %t \\\"%r\\\" %>s %b\" common\n CustomLog access.log common\n@@ -8,12 +9,6 @@ ErrorLog error.log\n \tLoadModule log_config_module modules/mod_log_config.so\n </IfModule>\n \n-<IfDefine Darwin>\n-\tLoadModule log_config_module modules/mod_log_config.so\n-\tLockFile accept.lock\n-\tPidFile httpd.pid\n-</IfDefine>\n-\n <IfDefine SSL>\n LoadModule ssl_module modules/mod_ssl.so\n \n"},{"id":"107748","messageId":"76718490903111543n33179571r2b3498f1f4ecacf3@mail.gmail.com","threadId":"18259","inReplyTo":"7vhc1z4y31.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Include log_config module in apache.conf","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2009-03-11T22:43:12Z","receivedAt":"2009-03-11T22:43:12Z","isPatch":true,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"On Wed, Mar 11, 2009 at 4:13 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> We have PidFile definition in the file already, and we have added\n> necessary LoadModule for log_config_module recently.\n>\n> This patch will end up giving LockFile to everybody not just limited to\n> Darwin, but why not?\n\nIn that case, the -DDarwin added to lib-httpd.sh by commit 69707d61 is\nno longer needed.\n\nj.\n"}]}