diff options
Diffstat (limited to 'src/core/ngx_conf_file.h')
| -rw-r--r-- | src/core/ngx_conf_file.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 322b23a6e..dc4eb7a69 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -20,8 +20,6 @@ #define NGX_CONF_TAKE5 0x00000020 #define NGX_CONF_TAKE6 0x00000040 #define NGX_CONF_TAKE7 0x00000080 -#define NGX_CONF_TAKE8 0x00000100 -#define NGX_CONF_TAKE9 0x00000200 #define NGX_CONF_TAKE12 (NGX_CONF_TAKE1|NGX_CONF_TAKE2) #define NGX_CONF_TAKE13 (NGX_CONF_TAKE1|NGX_CONF_TAKE3) @@ -31,13 +29,14 @@ #define NGX_CONF_TAKE1234 (NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3 \ |NGX_CONF_TAKE4) -#define NGX_CONF_ARGS_NUMBER 0x0000ffff -#define NGX_CONF_BLOCK 0x00010000 -#define NGX_CONF_FLAG 0x00020000 -#define NGX_CONF_ANY 0x00040000 -#define NGX_CONF_1MORE 0x00080000 -#define NGX_CONF_2MORE 0x00100000 +#define NGX_CONF_ARGS_NUMBER 0x000000ff +#define NGX_CONF_BLOCK 0x00000100 +#define NGX_CONF_FLAG 0x00000200 +#define NGX_CONF_ANY 0x00000400 +#define NGX_CONF_1MORE 0x00000800 +#define NGX_CONF_2MORE 0x00001000 +#define NGX_DIRECT_CONF 0x00010000 #define NGX_MAIN_CONF 0x01000000 @@ -102,6 +101,13 @@ struct ngx_module_s { typedef struct { + ngx_str_t name; + void *(*create_conf)(ngx_cycle_t *cycle); + char *(*init_conf)(ngx_cycle_t *cycle, void *conf); +} ngx_core_module_t; + + +typedef struct { ngx_file_t file; ngx_hunk_t *hunk; int line; @@ -254,13 +260,6 @@ char *ngx_conf_set_time_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); char *ngx_conf_set_bufs_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 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_num_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_int_t ngx_max_module; extern ngx_module_t *ngx_modules[]; |