Mercurial > hg > nginx

diff src/http/ngx_http_config.h @ 91:637625a2acdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2003-05-19-20:39:14 import
author Igor Sysoev <igor@sysoev.ru>
date Mon, 19 May 2003 16:39:14 +0000
parents 37530da31268
children a23d010f356d
line wrap: on
line diff
--- 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 {
 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);