diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-05-21 16:12:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-05-21 16:12:13 +0000 |
| commit | 01b5eab38147e84a1cde453059279c5ad7ad2293 (patch) | |
| tree | dc07506d775d943813cd0a384126372cf95e04c8 /src/http/ngx_http_core_module.c | |
| parent | 18684bd5ad9098c67b791ca2943e2f65917b2c2b (diff) | |
| download | nginx-01b5eab38147e84a1cde453059279c5ad7ad2293.tar.gz nginx-01b5eab38147e84a1cde453059279c5ad7ad2293.zip | |
nginx-0.0.3-2004-05-21-20:12:13 import
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 73a114ac5..52e4a2715 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -826,7 +826,7 @@ static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy) int m; char *rv; ngx_http_module_t *module; - ngx_conf_t pcf; + ngx_conf_t pvcf; ngx_http_conf_ctx_t *ctx, *hctx; ngx_http_core_main_conf_t *cmcf; ngx_http_core_srv_conf_t *cscf, **cscfp; @@ -881,14 +881,11 @@ static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy) /* parse inside server{} */ - pcf = *cf; -#if 0 - pctx = cf->ctx; -#endif + pvcf = *cf; cf->ctx = ctx; cf->cmd_type = NGX_HTTP_SRV_CONF; rv = ngx_conf_parse(cf, NULL); - *cf = pcf; + *cf = pvcf; if (rv != NGX_CONF_OK) { return rv; |