diff options
Diffstat (limited to 'src/core/ngx_conf_file.h')
| -rw-r--r-- | src/core/ngx_conf_file.h | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 536294779..e1c4e33ce 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -85,26 +85,6 @@ struct ngx_open_file_s { }; -struct ngx_cycle_s { - void ****conf_ctx; - ngx_pool_t *pool; - ngx_log_t *log; - ngx_array_t listening; - ngx_array_t open_files; - ngx_array_t pathes; - - int connection_n; - ngx_connection_t *connections; - ngx_event_t *read_events; - ngx_event_t *write_events; - - ngx_cycle_t *cycle; - ngx_cycle_t *old_cycle; - - unsigned one_process:1; -}; - - struct ngx_module_s { int ctx_index; int index; @@ -112,7 +92,10 @@ struct ngx_module_s { ngx_command_t *commands; int type; int (*init_module)(ngx_cycle_t *cycle); - int (*init_child)(ngx_cycle_t *cycle); + int (*init_process)(ngx_cycle_t *cycle); +#if 0 + int (*init_thread)(ngx_cycle_t *cycle); +#endif }; @@ -271,11 +254,12 @@ char *ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); char *ngx_conf_set_core_flag_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); +char *ngx_conf_set_core_str_slot(ngx_conf_t *cf, ngx_command_t *cmd, + void *conf); -extern ngx_module_t *ngx_modules[]; -extern volatile ngx_cycle_t *ngx_cycle; -extern ngx_array_t ngx_old_cycles; +extern ngx_int_t ngx_max_module; +extern ngx_module_t *ngx_modules[]; #endif /* _NGX_HTTP_CONF_FILE_H_INCLUDED_ */ |