On 10/15/2013 05:27 PM, Jeff Trawick wrote:
Does this patch/commit look okay? It works for me with a simple
provider in different scenarios (vhost that inherits provider setup from
s_main, vhost that has its own setup).
I suppose mod_syslog needs to disallow any attempts to configure it in a
vhost with different settings since openlog() is process-wide. Jan, can
you look at that by chance?
I've done that in r1541029.
Jan Kaluza
---------- Forwarded message ----------
From: ** <traw...@apache.org <mailto:traw...@apache.org>>
Date: Tue, Oct 15, 2013 at 10:09 AM
Subject: svn commit: r1532344 - /httpd/httpd/trunk/server/log.c
To: c...@httpd.apache.org <mailto:c...@httpd.apache.org>
Author: trawick
Date: Tue Oct 15 14:09:29 2013
New Revision: 1532344
URL: http://svn.apache.org/r1532344
Log:
Follow-up to r1525597:
Initialize error log providers in vhosts, solving crashes
when logging from those vhosts as well as allowing a different
provider (or provider configuration) for vhosts.
Modified:
httpd/httpd/trunk/server/log.c
Modified: httpd/httpd/trunk/server/log.c
URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/server/log.c?rev=1532344&r1=1532343&r2=1532344&view=diff
==============================================================================
--- httpd/httpd/trunk/server/log.c (original)
+++ httpd/httpd/trunk/server/log.c Tue Oct 15 14:09:29 2013
@@ -458,6 +458,18 @@ int ap_open_logs(apr_pool_t *pconf, apr_
virt->error_log = q->error_log;
}
}
+ else if (virt->errorlog_provider) {
+ /* separately-configured vhost-specific provider */
+ if (open_error_log(virt, 0, p) != OK) {
+ return DONE;
+ }
+ }
+ else if (s_main->errorlog_provider) {
+ /* inherit provider from s_main */
+ virt->errorlog_provider = s_main->errorlog_provider;
+ virt->errorlog_provider_handle =
s_main->errorlog_provider_handle;
+ virt->error_log = NULL;
+ }
else {
virt->error_log = s_main->error_log;
}
--
Born in Roswell... married an alien...
http://emptyhammock.com/