diff options
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_files.c | 3 | ||||
| -rw-r--r-- | src/os/unix/ngx_files.h | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_recv_chain.c | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index 732cfdf22..9ed378dd2 100644 --- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -11,7 +11,8 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset) { ssize_t n; - ngx_log_debug(file->log, "read: %x, %d, %qd" _ buf _ size _ offset); + ngx_log_debug(file->log, "read: %d, %x, %d, %qd" _ + file->fd _ buf _ size _ offset); n = pread(file->fd, buf, size, offset); diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h index 92448cc0f..37d136af7 100644 --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -22,7 +22,7 @@ #define ngx_close_file_n "close()" #define ngx_open_tempfile(name, persistent) \ - open(name, O_CREAT|O_EXCL|O_WRONLY, 0600) + open(name, O_CREAT|O_EXCL|O_RDWR, 0600) #define ngx_open_tempfile_n "open()" ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset); diff --git a/src/os/unix/ngx_recv_chain.c b/src/os/unix/ngx_recv_chain.c index 18054e783..de3de73dc 100644 --- a/src/os/unix/ngx_recv_chain.c +++ b/src/os/unix/ngx_recv_chain.c @@ -18,10 +18,12 @@ ssize_t ngx_recv_chain(ngx_connection_t *c, ngx_chain_t *ce) while (ce) { ngx_test_null(iov, ngx_push_array(&io), NGX_ERROR); iov->iov_base = ce->hunk->pos; - iov->iov_len = ce->hunk->last - ce->hunk->pos; + iov->iov_len = ce->hunk->end - ce->hunk->last; ce = ce->next; } +ngx_log_debug(c->log, "recv: %d:%d" _ io.nelts _ iov->iov_len); + n = readv(c->fd, (struct iovec *) io.elts, io.nelts); ngx_destroy_array(&io); @@ -29,6 +31,7 @@ ssize_t ngx_recv_chain(ngx_connection_t *c, ngx_chain_t *ce) if (n == -1) { c->read->ready = 0; + err = ngx_errno; if (err == NGX_EAGAIN) { ngx_log_error(NGX_LOG_INFO, c->log, err, "readv() returned EAGAIN"); return NGX_AGAIN; |