commit a98301160de4c12f455cca8f78509f2e04626c0b
author Igor Sysoev <igor@sysoev.ru> Mon May 19 16:39:14 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon May 19 16:39:14 2003 +0000
tree cdf14046298d40ca8398925603fb4011360b187a
parent bb4ec5c1721defd7b10f83ace51bddb71726dd1a

nginx-0.0.1-2003-05-19-20:39:14 import

src/http/ngx_http_config.h

diff --git a/src/http/ngx_http_config.h b/src/http/ngx_http_config.h
index 370b7db..abd3bdb 100644
--- a/src/http/ngx_http_config.h
+++ b/src/http/ngx_http_config.h
@@ -7,9 +7,9 @@
 
 
 typedef struct {
-    void        **main_conf;
-    void        **srv_conf;
-    void        **loc_conf;
+    void   **main_conf;
+    void   **srv_conf;
+    void   **loc_conf;
 } ngx_http_conf_ctx_t;
 
 
@@ -22,8 +22,11 @@
 typedef struct {
     int      index;
 
+    void  *(*create_main_conf)(ngx_pool_t *p);
+    char  *(*init_main_conf)(ngx_pool_t *p, void *conf);
+
     void  *(*create_srv_conf)(ngx_pool_t *p);
-    char  *(*init_srv_conf)(ngx_pool_t *p, void *conf);
+    char  *(*merge_srv_conf)(ngx_pool_t *p, void *prev, void *conf);
 
     void  *(*create_loc_conf)(ngx_pool_t *p);
     char  *(*merge_loc_conf)(ngx_pool_t *p, void *prev, void *conf);