diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-07-16 17:11:43 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-07-16 17:11:43 +0000 |
| commit | f38e046a0a2e7437f8232ef2a99cead69c4b9ebb (patch) | |
| tree | 5d9a68d757f7994506cdb497ce43d4ddd63c7eaa /src/core | |
| parent | 0ad253766fb8d62f257c446410a632a596ac5783 (diff) | |
| download | nginx-f38e046a0a2e7437f8232ef2a99cead69c4b9ebb.tar.gz nginx-f38e046a0a2e7437f8232ef2a99cead69c4b9ebb.tar.bz2 | |
nginx-0.0.7-2004-07-16-21:11:43 import
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_buf.h | 1 | ||||
| -rw-r--r-- | src/core/ngx_core.h | 3 | ||||
| -rw-r--r-- | src/core/ngx_output_chain.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h index 1927ed415..feaad4c96 100644 --- a/src/core/ngx_buf.h +++ b/src/core/ngx_buf.h @@ -132,6 +132,7 @@ typedef struct { #define NGX_CHAIN_ERROR (ngx_chain_t *) NGX_ERROR +#define NGX_CHAIN_AGAIN (ngx_chain_t *) NGX_AGAIN #define ngx_buf_in_memory(b) (b->temporary || b->memory || b->mmap) diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h index 575717f10..4c2712cfa 100644 --- a/src/core/ngx_core.h +++ b/src/core/ngx_core.h @@ -14,6 +14,9 @@ typedef struct ngx_file_s ngx_file_t; typedef struct ngx_event_s ngx_event_t; typedef struct ngx_connection_s ngx_connection_t; +typedef void (*ngx_event_handler_pt)(ngx_event_t *ev); + + #define NGX_OK 0 #define NGX_ERROR -1 diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c index aea6219da..02d780f37 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -274,7 +274,7 @@ ngx_int_t ngx_chain_writer(void *data, ngx_chain_t *in) ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->connection->log, 0, "WRITER0: %X", ctx->out); - ctx->out = ngx_write_chain(ctx->connection, ctx->out, ctx->limit); + ctx->out = ngx_send_chain(ctx->connection, ctx->out, ctx->limit); ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->connection->log, 0, "WRITER1: %X", ctx->out); |
