diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-04-14 17:04:58 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-04-14 17:04:58 +0000 |
| commit | 9e4920b810e1e5e620d3c3638b20cef7446baa6d (patch) | |
| tree | dbe4721aa1ae68ea087c2b8cd2898bfcfba4b105 /src/http/ngx_http_core_module.c | |
| parent | fd67586ef670a2ed181bb19d60619714f404aacc (diff) | |
| download | nginx-9e4920b810e1e5e620d3c3638b20cef7446baa6d.tar.gz nginx-9e4920b810e1e5e620d3c3638b20cef7446baa6d.zip | |
nginx-0.0.1-2003-04-14-21:04:58 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, 5 insertions, 0 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 4953971a8..310f94009 100644 --- 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 *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], @@ -682,6 +684,8 @@ static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, char *dummy) 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 *cf, ngx_command_t *cmd, char *dummy) return NGX_CONF_ERROR; } } +ngx_log_debug(cf->pool->log, "server merge done"); } } |