commit 74e95c224ad84c6b84b5a834f49c014a441916b5
author Igor Sysoev <igor@sysoev.ru> Sun Nov 09 20:03:38 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Sun Nov 09 20:03:38 2003 +0000
tree fea6b4e7b2706f089e462d201e90ec95f5a98fa2
parent e8732b06b94ea5f8a25fa3e71cece7d93f5ac0b8

nginx-0.0.1-2003-11-09-23:03:38 import; separate building

src/http/ngx_http.c

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index c2e9178..5f561f7 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -123,7 +123,6 @@
         }
     }
 
-
     /* parse inside the http{} block */
 
     pcf = *cf;
@@ -131,14 +130,16 @@
     cf->module_type = NGX_HTTP_MODULE;
     cf->cmd_type = NGX_HTTP_MAIN_CONF;
     rv = ngx_conf_parse(cf, NULL);
-    *cf = pcf;
 
-    if (rv != NGX_CONF_OK)
+    if (rv != NGX_CONF_OK) {
+        *cf = pcf;
         return rv;
+    }
 
-
-    /* init http{} main_conf's, merge the server{}s' srv_conf's
-       and its location{}s' loc_conf's */
+    /*
+     * init http{} main_conf's, merge the server{}s' srv_conf's
+     * and its location{}s' loc_conf's
+     */
 
     cmcf = ctx->main_conf[ngx_http_core_module.ctx_index];
     cscfp = cmcf->servers.elts;
@@ -556,5 +557,6 @@
     }
     /**/
 
+    *cf = pcf;
     return NGX_CONF_OK;
 }