diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_buf.h | 23 | ||||
| -rw-r--r-- | src/core/ngx_connection.h | 7 | ||||
| -rw-r--r-- | src/core/ngx_output_chain.c | 2 |
3 files changed, 8 insertions, 24 deletions
diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h index f2489f1a6..eb75c3bea 100644 --- a/src/core/ngx_buf.h +++ b/src/core/ngx_buf.h @@ -142,29 +142,6 @@ typedef struct { (ngx_buf_in_memory(b) ? (size_t) (b->last - b->pos): \ (size_t) (b->file_last - b->file_pos)) -#if 0 - -#define ngx_hunk_in_memory_only(h) \ - ((h->type & (NGX_HUNK_IN_MEMORY|NGX_HUNK_FILE)) == NGX_HUNK_IN_MEMORY) -/* - ((h->type & (NGX_HUNK_TEMP|NGX_HUNK_MEMORY|NGX_HUNK_MMAP|NGX_HUNK_FILE)) \ - == (h->type & (NGX_HUNK_TEMP|NGX_HUNK_MEMORY|NGX_HUNK_MMAP))) - -*/ - - - -#define ngx_hunk_special(b) \ - (b->type == (b->type & (NGX_HUNK_FLUSH|NGX_HUNK_LAST))) - - -#define ngx_hunk_size(b) \ - ((b->type & NGX_HUNK_IN_MEMORY) ? (size_t) (b->last - b->pos): \ - (size_t) (b->file_last - b->file_pos)) - -#endif - - ngx_buf_t *ngx_create_temp_buf(ngx_pool_t *pool, size_t size); ngx_chain_t *ngx_create_chain_of_bufs(ngx_pool_t *pool, ngx_bufs_t *bufs); diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index af85e7d81..ecd3c8bc4 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -60,6 +60,13 @@ typedef enum { } ngx_connection_log_error_e; +typedef enum { + NGX_TCP_NOPUSH_DISABLED = -1, + NGX_TCP_NOPUSH_UNSET = 0, + NGX_TCP_NOPUSH_SET +} ngx_connection_tcp_nopush_e; + + struct ngx_connection_s { void *data; ngx_event_t *read; diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c index 0afa697f7..5ea4fd90b 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -38,7 +38,7 @@ int ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in) } } - /* add the incoming hunk to the chain ctx->in */ + /* add the incoming buf to the chain ctx->in */ if (in) { if (ngx_chain_add_copy(ctx->pool, &ctx->in, in) == NGX_ERROR) { |