diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-06-03 19:58:30 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-06-03 19:58:30 +0000 |
| commit | b2c5db58dc18e322b344084f7f88dd58f4b4629a (patch) | |
| tree | 3ca8c3e8c4fe6ba2744690d8bea0e771d07b0947 /src/core/ngx_output_chain.c | |
| parent | 70c1d0f1609d762b1d5acbc8d66f73a599634f57 (diff) | |
| download | nginx-b2c5db58dc18e322b344084f7f88dd58f4b4629a.tar.gz nginx-b2c5db58dc18e322b344084f7f88dd58f4b4629a.zip | |
inherit flush flag, this fixes https proxying
Diffstat (limited to 'src/core/ngx_output_chain.c')
| -rw-r--r-- | src/core/ngx_output_chain.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c index 554fe1b15..6bb463a83 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -377,8 +377,9 @@ ngx_output_chain_copy_buf(ngx_buf_t *dst, ngx_buf_t *src, ngx_uint_t sendfile) dst->in_file = 0; } - if (src->last_buf && src->pos == src->last) { - dst->last_buf = 1; + if (src->pos == src->last) { + dst->flush = src->flush; + dst->last_buf = src->last_buf; } } else { @@ -417,8 +418,9 @@ ngx_output_chain_copy_buf(ngx_buf_t *dst, ngx_buf_t *src, ngx_uint_t sendfile) src->file_pos += n; - if (src->last_buf && src->file_pos == src->file_last) { - dst->last_buf = 1; + if (src->pos == src->last) { + dst->flush = src->flush; + dst->last_buf = src->last_buf; } } |