summaryrefslogtreecommitdiffhomepage
path: root/src/http/ngx_http_config.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2003-07-20 21:15:59 +0000
committerIgor Sysoev <igor@sysoev.ru>2003-07-20 21:15:59 +0000
commit890fc9659609396f9df4dff47a2be77cd652fe55 (patch)
treeb6694fd45d26bc9607ceb41608619dbbf4ccb23c /src/http/ngx_http_config.h
parent8e1fbe61b69562d838aafda8d75798993f022d4a (diff)
downloadnginx-890fc9659609396f9df4dff47a2be77cd652fe55.tar.gz
nginx-890fc9659609396f9df4dff47a2be77cd652fe55.tar.bz2
nginx-0.0.1-2003-07-21-01:15:59 import
Diffstat (limited to '')
-rw-r--r--src/http/ngx_http_config.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/http/ngx_http_config.h b/src/http/ngx_http_config.h
index 50804c3a6..9d200c448 100644
--- a/src/http/ngx_http_config.h
+++ b/src/http/ngx_http_config.h
@@ -20,14 +20,14 @@ typedef struct {
typedef struct {
- void *(*create_main_conf)(ngx_pool_t *p);
- char *(*init_main_conf)(ngx_pool_t *p, void *conf);
+ void *(*create_main_conf)(ngx_conf_t *cf);
+ char *(*init_main_conf)(ngx_conf_t *cf, void *conf);
- void *(*create_srv_conf)(ngx_pool_t *p);
- char *(*merge_srv_conf)(ngx_pool_t *p, void *prev, void *conf);
+ void *(*create_srv_conf)(ngx_conf_t *cf);
+ char *(*merge_srv_conf)(ngx_conf_t *cf, void *prev, void *conf);
- void *(*create_loc_conf)(ngx_pool_t *p);
- char *(*merge_loc_conf)(ngx_pool_t *p, void *prev, void *conf);
+ void *(*create_loc_conf)(ngx_conf_t *cf);
+ char *(*merge_loc_conf)(ngx_conf_t *cf, void *prev, void *conf);
} ngx_http_module_t;