Mercurial > hg > nginx
diff src/http/ngx_http_core_module.c @ 75:869b10be682f
nginx-0.0.1-2003-04-14-21:04:58 import
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 14 Apr 2003 17:04:58 +0000 |
| parents | 17ab1af8c3dd |
| children | 6127d7075471 |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -674,6 +674,8 @@ static char *ngx_server_block(ngx_conf_t } } +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], @@ -682,6 +684,8 @@ static char *ngx_server_block(ngx_conf_t 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], @@ -690,6 +694,7 @@ static char *ngx_server_block(ngx_conf_t return NGX_CONF_ERROR; } } +ngx_log_debug(cf->pool->log, "server merge done"); } }