Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 176:c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 09 Nov 2003 20:03:38 +0000 |
parents | ef8c87afcfc5 |
children | 4db54fdbcbe7 |
comparison
equal
deleted
inserted
replaced
175:e92c2c647c57 | 176:c0552e5ab567 |
---|---|
121 ngx_test_null(ctx->loc_conf[mi], module->create_loc_conf(cf), | 121 ngx_test_null(ctx->loc_conf[mi], module->create_loc_conf(cf), |
122 NGX_CONF_ERROR); | 122 NGX_CONF_ERROR); |
123 } | 123 } |
124 } | 124 } |
125 | 125 |
126 | |
127 /* parse inside the http{} block */ | 126 /* parse inside the http{} block */ |
128 | 127 |
129 pcf = *cf; | 128 pcf = *cf; |
130 cf->ctx = ctx; | 129 cf->ctx = ctx; |
131 cf->module_type = NGX_HTTP_MODULE; | 130 cf->module_type = NGX_HTTP_MODULE; |
132 cf->cmd_type = NGX_HTTP_MAIN_CONF; | 131 cf->cmd_type = NGX_HTTP_MAIN_CONF; |
133 rv = ngx_conf_parse(cf, NULL); | 132 rv = ngx_conf_parse(cf, NULL); |
134 *cf = pcf; | 133 |
135 | 134 if (rv != NGX_CONF_OK) { |
136 if (rv != NGX_CONF_OK) | 135 *cf = pcf; |
137 return rv; | 136 return rv; |
138 | 137 } |
139 | 138 |
140 /* init http{} main_conf's, merge the server{}s' srv_conf's | 139 /* |
141 and its location{}s' loc_conf's */ | 140 * init http{} main_conf's, merge the server{}s' srv_conf's |
141 * and its location{}s' loc_conf's | |
142 */ | |
142 | 143 |
143 cmcf = ctx->main_conf[ngx_http_core_module.ctx_index]; | 144 cmcf = ctx->main_conf[ngx_http_core_module.ctx_index]; |
144 cscfp = cmcf->servers.elts; | 145 cscfp = cmcf->servers.elts; |
145 | 146 |
146 for (m = 0; ngx_modules[m]; m++) { | 147 for (m = 0; ngx_modules[m]; m++) { |
554 } | 555 } |
555 } | 556 } |
556 } | 557 } |
557 /**/ | 558 /**/ |
558 | 559 |
560 *cf = pcf; | |
559 return NGX_CONF_OK; | 561 return NGX_CONF_OK; |
560 } | 562 } |