aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_config.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/http/ngx_http_config.h')
-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;