diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-04-24 14:46:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-04-24 14:46:08 +0000 |
| commit | 0e18ebd0d931e175b7d92c0d6fb36c1c60c2aac9 (patch) | |
| tree | 4cc0921e30069e29ee0456d8c2fcd693e81fde39 /src/http/ngx_http_core_module.c | |
| parent | fb970519d45f7fb299dfaba854b8cc58d4dc4711 (diff) | |
| download | nginx-0e18ebd0d931e175b7d92c0d6fb36c1c60c2aac9.tar.gz nginx-0e18ebd0d931e175b7d92c0d6fb36c1c60c2aac9.zip | |
nginx-0.0.1-2003-04-24-18:46:08 import
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 3ae8017fc..9eab6ad08 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -674,8 +674,6 @@ static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, char *dummy) } } -ngx_log_debug(cf->pool->log, "main merge"); - if (module->merge_loc_conf) { if (module->merge_loc_conf(cf->pool, prev->loc_conf[module->index], @@ -684,8 +682,6 @@ ngx_log_debug(cf->pool->log, "main merge"); return NGX_CONF_ERROR; } -ngx_log_debug(cf->pool->log, "server merge"); - for (j = 0; j < scf->locations.nelts; j++) { if (module->merge_loc_conf(cf->pool, ctx->loc_conf[module->index], @@ -694,7 +690,6 @@ ngx_log_debug(cf->pool->log, "server merge"); return NGX_CONF_ERROR; } } -ngx_log_debug(cf->pool->log, "server merge done"); } } |