commit b4fbdcf5d4bdaad5b762c2852c88123ed54a4bbb
author Igor Sysoev <igor@sysoev.ru> Mon Jun 30 12:35:16 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Jun 30 12:35:16 2008 +0000
tree 66b1f911ac5d19ca710c753bbd15bf5a0dc505a4
parent b882154636c92aede2b682e4ae10c324d8d5cf35

-g switch

src/core/ngx_cycle.c

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index a82e850..725f54b 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -90,6 +90,16 @@
                 old_cycle->conf_file.len + 1);
 
 
+    cycle->conf_param.len = old_cycle->conf_param.len;
+    cycle->conf_param.data = ngx_pnalloc(pool, old_cycle->conf_param.len);
+    if (cycle->conf_param.data == NULL) {
+        ngx_destroy_pool(pool);
+        return NULL;
+    }
+    ngx_memcpy(cycle->conf_param.data, old_cycle->conf_param.data,
+               old_cycle->conf_param.len);
+
+
     n = old_cycle->pathes.nelts ? old_cycle->pathes.nelts : 10;
 
     cycle->pathes.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *));
@@ -238,6 +248,11 @@
     log->log_level = NGX_LOG_DEBUG_ALL;
 #endif
 
+    if (ngx_conf_param(&conf) != NGX_CONF_OK) {
+        ngx_destroy_cycle_pools(&conf);
+        return NULL;
+    }
+
     if (ngx_conf_parse(&conf, &cycle->conf_file) != NGX_CONF_OK) {
         ngx_destroy_cycle_pools(&conf);
         return NULL;