On 06/14/2010 09:59 PM, [email protected] wrote: > Author: sf > Date: Mon Jun 14 19:59:05 2010 > New Revision: 954611 > > URL: http://svn.apache.org/viewvc?rev=954611&view=rev > Log: > - Introduce ap_log_cserror to allow mod_ssl to associate log messages to > different servers than c->base_server. > - Adjust the scope of some mod_ssl trace logging from server to conn. > > Modified: > httpd/httpd/trunk/include/ap_mmn.h > httpd/httpd/trunk/include/http_config.h > httpd/httpd/trunk/include/http_log.h > httpd/httpd/trunk/modules/ssl/ssl_engine_io.c > httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c > httpd/httpd/trunk/server/log.c > httpd/httpd/trunk/server/util_debug.c > > Modified: httpd/httpd/trunk/server/log.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/server/log.c?rev=954611&r1=954610&r2=954611&view=diff > ============================================================================== > --- httpd/httpd/trunk/server/log.c (original) > +++ httpd/httpd/trunk/server/log.c Mon Jun 14 19:59:05 2010 > @@ -820,6 +820,19 @@ AP_DECLARE(void) ap_log_rerror_(const ch > va_end(args); > } > > +AP_DECLARE(void) ap_log_cserror_(const char *file, int line, int > module_index, > + int level, apr_status_t status, > + const conn_rec *c, const server_rec *s, > + const char *fmt, ...) > +{ > + va_list args; > + > + va_start(args, fmt); > + log_error_core(file, line, module_index, level, status, s, c, > + NULL, NULL, fmt, args);
Don't we need to patch log_error_core as well? IMHO if c != NULL it prefers the setting from c in any case, but +#define ap_get_conn_server_logconf(c,s) \ + ( ( (c)->log != &(c)->base_server->log && (c)->log != NULL ) ? \ + (c)->log : \ + &(s)->log ) + says to prefer it only if (c)->log != &(c)->base_server->log Regards Rüdiger
