diff options
| author | Kaspar Brand <kbrand@apache.org> | 2015-04-15 17:53:00 +0200 |
|---|---|---|
| committer | Kaspar Brand <kbrand@apache.org> | 2015-04-15 17:53:00 +0200 |
| commit | 2f64c139ef619fceaed9fad9d94823a4e53699cd (patch) | |
| tree | 7c78ea867066a8870b25d1a3ab8e906ad1e68b84 /server/config.c | |
| parent | Resolves bz56695 - %O can in fact be zero sometimes. (diff) | |
| download | apache2-2f64c139ef619fceaed9fad9d94823a4e53699cd.tar.xz apache2-2f64c139ef619fceaed9fad9d94823a4e53699cd.zip | |
Revert r1672014 - doesn't work as advertised (would break configs
where the per-vhost log level is different from the global level)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673838 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/config.c')
| -rw-r--r-- | server/config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/config.c b/server/config.c index 00f982b630..aea1ff1dbd 100644 --- a/server/config.c +++ b/server/config.c @@ -2194,7 +2194,7 @@ AP_CORE_DECLARE(const char *) ap_init_virtual_host(apr_pool_t *p, s->keep_alive = -1; s->keep_alive_max = -1; s->error_log = main_server->error_log; - s->log.level = main_server->log.level; + s->log.level = APLOG_UNSET; s->log.module_levels = NULL; /* useful default, otherwise we get a port of 0 on redirects */ s->port = main_server->port; @@ -2286,7 +2286,6 @@ AP_DECLARE(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server) if (virt->keep_alive_max == -1) virt->keep_alive_max = main_server->keep_alive_max; - virt->log.level = APLOG_UNSET; ap_merge_log_config(&main_server->log, &virt->log); dconf = ap_get_core_module_config(virt->lookup_defaults); |