comparison src/http/ngx_http_core_module.c @ 339:8c5b69141dfd

nginx-0.0.3-2004-05-21-20:12:13 import
author Igor Sysoev <igor@sysoev.ru>
date Fri, 21 May 2004 16:12:13 +0000
parents d4241d7787fe
children e366ba5db8f8
comparison
equal deleted inserted replaced
338:0376cffa29e6 339:8c5b69141dfd
824 static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy) 824 static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy)
825 { 825 {
826 int m; 826 int m;
827 char *rv; 827 char *rv;
828 ngx_http_module_t *module; 828 ngx_http_module_t *module;
829 ngx_conf_t pcf; 829 ngx_conf_t pvcf;
830 ngx_http_conf_ctx_t *ctx, *hctx; 830 ngx_http_conf_ctx_t *ctx, *hctx;
831 ngx_http_core_main_conf_t *cmcf; 831 ngx_http_core_main_conf_t *cmcf;
832 ngx_http_core_srv_conf_t *cscf, **cscfp; 832 ngx_http_core_srv_conf_t *cscf, **cscfp;
833 833
834 ngx_test_null(ctx, 834 ngx_test_null(ctx,
879 ngx_test_null(cscfp, ngx_push_array(&cmcf->servers), NGX_CONF_ERROR); 879 ngx_test_null(cscfp, ngx_push_array(&cmcf->servers), NGX_CONF_ERROR);
880 *cscfp = cscf; 880 *cscfp = cscf;
881 881
882 /* parse inside server{} */ 882 /* parse inside server{} */
883 883
884 pcf = *cf; 884 pvcf = *cf;
885 #if 0
886 pctx = cf->ctx;
887 #endif
888 cf->ctx = ctx; 885 cf->ctx = ctx;
889 cf->cmd_type = NGX_HTTP_SRV_CONF; 886 cf->cmd_type = NGX_HTTP_SRV_CONF;
890 rv = ngx_conf_parse(cf, NULL); 887 rv = ngx_conf_parse(cf, NULL);
891 *cf = pcf; 888 *cf = pvcf;
892 889
893 if (rv != NGX_CONF_OK) { 890 if (rv != NGX_CONF_OK) {
894 return rv; 891 return rv;
895 } 892 }
896 893