diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-10-27 19:46:13 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-10-27 19:46:13 +0400 |
| commit | 697d1aea0c7b1525beed2911f9f32426280df8f4 (patch) | |
| tree | 3c59875442d9a8114785a04003fcc3b7b059dc55 /src/core/ngx_conf_file.h | |
| parent | 968b2a868ba7950b7c11c81905eeb5ed87b889f2 (diff) | |
nginx-0.3.7-RELEASE importrelease-0.3.7
*) Feature: the "access_log" supports the "buffer=" parameter.
*) Bugfix: nginx could not be built on platforms different from i386,
amd64, sparc, and ppc; the bug had appeared in 0.3.2.
Diffstat (limited to 'src/core/ngx_conf_file.h')
| -rw-r--r-- | src/core/ngx_conf_file.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 9f344e64c..b09d8cc6a 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -34,6 +34,7 @@ #define NGX_CONF_TAKE23 (NGX_CONF_TAKE2|NGX_CONF_TAKE3) +#define NGX_CONF_TAKE123 (NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3) #define NGX_CONF_TAKE1234 (NGX_CONF_TAKE1|NGX_CONF_TAKE2|NGX_CONF_TAKE3 \ |NGX_CONF_TAKE4) @@ -87,6 +88,11 @@ struct ngx_command_s { struct ngx_open_file_s { ngx_fd_t fd; ngx_str_t name; + + u_char *buffer; + u_char *pos; + u_char *last; + #if 0 /* e.g. append mode, error_log */ ngx_uint_t flags; @@ -121,10 +127,10 @@ struct ngx_module_s { ngx_int_t (*init_process)(ngx_cycle_t *cycle); ngx_int_t (*init_thread)(ngx_cycle_t *cycle); - ngx_int_t (*exit_thread)(ngx_cycle_t *cycle); - ngx_int_t (*exit_process)(ngx_cycle_t *cycle); + void (*exit_thread)(ngx_cycle_t *cycle); + void (*exit_process)(ngx_cycle_t *cycle); - ngx_int_t (*exit_master)(ngx_cycle_t *cycle); + void (*exit_master)(ngx_cycle_t *cycle); uintptr_t spare_hook0; uintptr_t spare_hook1; |