Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 75:869b10be682f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
74:17ab1af8c3dd 75:869b10be682f
672 == NGX_CONF_ERROR) { 672 == NGX_CONF_ERROR) {
673 return NGX_CONF_ERROR; 673 return NGX_CONF_ERROR;
674 } 674 }
675 } 675 }
676 676
677 ngx_log_debug(cf->pool->log, "main merge");
678
677 if (module->merge_loc_conf) { 679 if (module->merge_loc_conf) {
678 if (module->merge_loc_conf(cf->pool, 680 if (module->merge_loc_conf(cf->pool,
679 prev->loc_conf[module->index], 681 prev->loc_conf[module->index],
680 ctx->loc_conf[module->index]) 682 ctx->loc_conf[module->index])
681 == NGX_CONF_ERROR) { 683 == NGX_CONF_ERROR) {
682 return NGX_CONF_ERROR; 684 return NGX_CONF_ERROR;
683 } 685 }
686
687 ngx_log_debug(cf->pool->log, "server merge");
684 688
685 for (j = 0; j < scf->locations.nelts; j++) { 689 for (j = 0; j < scf->locations.nelts; j++) {
686 if (module->merge_loc_conf(cf->pool, 690 if (module->merge_loc_conf(cf->pool,
687 ctx->loc_conf[module->index], 691 ctx->loc_conf[module->index],
688 plcf[j]->loc_conf[module->index]) 692 plcf[j]->loc_conf[module->index])
689 == NGX_CONF_ERROR) { 693 == NGX_CONF_ERROR) {
690 return NGX_CONF_ERROR; 694 return NGX_CONF_ERROR;
691 } 695 }
692 } 696 }
697 ngx_log_debug(cf->pool->log, "server merge done");
693 } 698 }
694 } 699 }
695 700
696 return NGX_CONF_OK; 701 return NGX_CONF_OK;
697 } 702 }