Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 81:b2ece31c976a
nginx-0.0.1-2003-04-24-18:46:08 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 24 Apr 2003 14:46:08 +0000 |
parents | 6127d7075471 |
children | fab4cb00fe5b |
comparison
equal
deleted
inserted
replaced
80:939bc7cd9a90 | 81:b2ece31c976a |
---|---|
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 | |
679 if (module->merge_loc_conf) { | 677 if (module->merge_loc_conf) { |
680 if (module->merge_loc_conf(cf->pool, | 678 if (module->merge_loc_conf(cf->pool, |
681 prev->loc_conf[module->index], | 679 prev->loc_conf[module->index], |
682 ctx->loc_conf[module->index]) | 680 ctx->loc_conf[module->index]) |
683 == NGX_CONF_ERROR) { | 681 == NGX_CONF_ERROR) { |
684 return NGX_CONF_ERROR; | 682 return NGX_CONF_ERROR; |
685 } | 683 } |
686 | |
687 ngx_log_debug(cf->pool->log, "server merge"); | |
688 | 684 |
689 for (j = 0; j < scf->locations.nelts; j++) { | 685 for (j = 0; j < scf->locations.nelts; j++) { |
690 if (module->merge_loc_conf(cf->pool, | 686 if (module->merge_loc_conf(cf->pool, |
691 ctx->loc_conf[module->index], | 687 ctx->loc_conf[module->index], |
692 plcf[j]->loc_conf[module->index]) | 688 plcf[j]->loc_conf[module->index]) |
693 == NGX_CONF_ERROR) { | 689 == NGX_CONF_ERROR) { |
694 return NGX_CONF_ERROR; | 690 return NGX_CONF_ERROR; |
695 } | 691 } |
696 } | 692 } |
697 ngx_log_debug(cf->pool->log, "server merge done"); | |
698 } | 693 } |
699 } | 694 } |
700 | 695 |
701 return NGX_CONF_OK; | 696 return NGX_CONF_OK; |
702 } | 697 } |