diff options
Diffstat (limited to 'src/core/ngx_conf_file.h')
| -rw-r--r-- | src/core/ngx_conf_file.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index e84137472..932f5bf93 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -56,13 +56,32 @@ struct ngx_command_s { #define ngx_null_command {ngx_null_string, 0, NULL, 0, 0, NULL} +struct ngx_open_file_s { + ngx_fd_t fd; + ngx_str_t name; +}; + + +struct ngx_cycle_s { + void ****conf_ctx; + ngx_pool_t *pool; + ngx_log_t *log; + ngx_array_t listening; + ngx_array_t open_files; + + unsigned one_process:1; +}; + + struct ngx_module_s { int ctx_index; int index; void *ctx; ngx_command_t *commands; int type; - int (*init_module)(ngx_pool_t *p); + int (*init_module)(ngx_cycle_t *cycle, ngx_log_t *log); + int (*commit_module)(ngx_cycle_t *cycle, ngx_log_t *log); + int (*rollback_module)(ngx_cycle_t *cycle, ngx_log_t *log); }; @@ -73,22 +92,6 @@ typedef struct { } ngx_conf_file_t; -struct ngx_open_file_s { - ngx_fd_t fd; - ngx_str_t name; -}; - - -typedef struct { - ngx_pool_t *pool; - ngx_log_t *log; - ngx_array_t listening; - ngx_array_t open_files; - - unsigned one_process:1; -} ngx_cycle_t; - - typedef char *(*ngx_conf_handler_pt)(ngx_conf_t *cf, ngx_command_t *dummy, void *conf); |