diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_conf_file.c | 4 | ||||
| -rw-r--r-- | src/core/ngx_conf_file.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_connection.h | 1 | ||||
| -rw-r--r-- | src/core/ngx_core.h | 1 | ||||
| -rw-r--r-- | src/core/ngx_hunk.h | 6 | ||||
| -rw-r--r-- | src/core/ngx_modules.c | 12 |
6 files changed, 18 insertions, 8 deletions
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 54d4f387b..241c7a897 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -32,7 +32,7 @@ char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename) /* open configuration file */ - fd = ngx_open_file(filename->data, NGX_FILE_RDONLY); + fd = ngx_open_file(filename->data, NGX_FILE_RDONLY, NGX_FILE_OPEN); if (fd == NGX_INVALID_FILE) { ngx_log_error(NGX_LOG_EMERG, cf->log, ngx_errno, ngx_open_file_n " %s failed", filename->data); @@ -142,7 +142,7 @@ ngx_log_debug(cf->log, "command '%s'" _ cmd->name.data); if (cmd->type & argument_number[cf->args->nelts - 1]) { valid = 1; - } else if (cmd->type & NGX_CONF_ANY1) { + } else if (cmd->type & NGX_CONF_1MORE) { if (cf->args->nelts != 1) { valid = 1; diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index b3f1d6304..20747b624 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -24,7 +24,7 @@ #define NGX_CONF_TAKE2 0x00000004 #define NGX_CONF_ARGS_NUMBER 0x0000ffff #define NGX_CONF_ANY 0x00010000 -#define NGX_CONF_ANY1 0x00020000 +#define NGX_CONF_1MORE 0x00020000 #define NGX_CONF_BLOCK 0x00040000 #define NGX_CONF_FLAG 0x00080000 diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index 59bf33307..c3e9e0902 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -61,6 +61,7 @@ struct ngx_connection_s { unsigned pipeline:1; unsigned unexpected_eof:1; + unsigned tcp_nopush:1; }; diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h index e8b311700..a612200d1 100644 --- a/src/core/ngx_core.h +++ b/src/core/ngx_core.h @@ -18,6 +18,7 @@ typedef struct ngx_event_s ngx_event_t; #include <ngx_array.h> #include <ngx_string.h> #include <ngx_file.h> +#include <ngx_inet.h> #include <ngx_conf_file.h> #include <ngx_os_init.h> #include <ngx_connection.h> diff --git a/src/core/ngx_hunk.h b/src/core/ngx_hunk.h index c097289d8..c0e0dbf7b 100644 --- a/src/core/ngx_hunk.h +++ b/src/core/ngx_hunk.h @@ -71,11 +71,9 @@ ngx_hunk_t *ngx_create_temp_hunk(ngx_pool_t *pool, int size, int before, int after); #define ngx_alloc_hunk(pool) ngx_palloc(pool, sizeof(ngx_hunk_t)) -#define ngx_alloc_chain_entry(pool) ngx_palloc(pool, sizeof(ngx_chain_t)) +#define ngx_calloc_hunk(pool) ngx_pcalloc(pool, sizeof(ngx_hunk_t)) -/* STUB */ -#define ngx_create_chain_entry(pool) ngx_palloc(pool, sizeof(ngx_chain_t)) -/**/ +#define ngx_alloc_chain_entry(pool) ngx_palloc(pool, sizeof(ngx_chain_t)) #define ngx_add_hunk_to_chain(chain, h, pool, error) \ do { \ diff --git a/src/core/ngx_modules.c b/src/core/ngx_modules.c index 8f57db399..27d150cd2 100644 --- a/src/core/ngx_modules.c +++ b/src/core/ngx_modules.c @@ -29,10 +29,16 @@ extern ngx_module_t ngx_http_write_filter_module; extern ngx_module_t ngx_http_output_filter_module; extern ngx_module_t ngx_http_header_filter_module; +extern ngx_module_t ngx_http_chunked_filter_module; +extern ngx_module_t ngx_http_range_filter_module; +extern ngx_module_t ngx_http_charset_filter_module; + extern ngx_module_t ngx_http_index_module; extern ngx_module_t ngx_http_static_module; extern ngx_module_t ngx_http_proxy_module; +extern ngx_module_t ngx_http_log_module; + ngx_module_t *ngx_modules[] = { @@ -64,13 +70,17 @@ ngx_module_t *ngx_modules[] = { &ngx_http_output_filter_module, &ngx_http_header_filter_module, + &ngx_http_chunked_filter_module, /* &ngx_http_gzip_filter_module, */ - /* &ngx_http_range_filter_module, */ + &ngx_http_range_filter_module, /* &ngx_http_ssi_filter_module, */ + &ngx_http_charset_filter_module, &ngx_http_index_module, /* &ngx_http_static_module, */ /* &ngx_http_proxy_module, */ + &ngx_http_log_module, + NULL }; |