diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-05-19 16:39:14 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-05-19 16:39:14 +0000 |
| commit | a98301160de4c12f455cca8f78509f2e04626c0b (patch) | |
| tree | cdf14046298d40ca8398925603fb4011360b187a /src/http/ngx_http_config.h | |
| parent | bb4ec5c1721defd7b10f83ace51bddb71726dd1a (diff) | |
| download | nginx-a98301160de4c12f455cca8f78509f2e04626c0b.tar.gz nginx-a98301160de4c12f455cca8f78509f2e04626c0b.tar.bz2 | |
nginx-0.0.1-2003-05-19-20:39:14 import
Diffstat (limited to '')
| -rw-r--r-- | src/http/ngx_http_config.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/http/ngx_http_config.h b/src/http/ngx_http_config.h index 370b7db3a..abd3bdb26 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 { 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); |