nginx-0.0.1-2003-06-02-19:24:30 import
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index 54d4f38..241c7a8 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -32,7 +32,7 @@
/* 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 @@
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 b3f1d63..20747b6 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 59bf333..c3e9e09 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -61,6 +61,7 @@
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 e8b3117..a612200 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -18,6 +18,7 @@
#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 c097289..c0e0dbf 100644
--- a/src/core/ngx_hunk.h
+++ b/src/core/ngx_hunk.h
@@ -71,11 +71,9 @@
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 8f57db3..27d150c 100644
--- a/src/core/ngx_modules.c
+++ b/src/core/ngx_modules.c
@@ -29,10 +29,16 @@
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_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
};
