commit 5bf3d25d69ecdbccaa98beeb089a7a6850529b89
author Igor Sysoev <igor@sysoev.ru> Wed Oct 22 07:05:29 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Oct 22 07:05:29 2003 +0000
tree 1bc211941faf078f87f79bea1f2703e3190483fa
parent 419f9aceb4d994c2f7f51400f59fb2da0ed666d4

nginx-0.0.1-2003-10-22-11:05:29 import

src/os/unix/ngx_files.c

diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 9ed378d..adafc17 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -77,15 +77,15 @@
         ce = ce->next;
     }
 
-    if (lseek(file->fd, offset, SEEK_SET) == -1) {
-        ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "lseek() failed");
-        return NGX_ERROR;
+    if (file->offset != offset) {
+        if (lseek(file->fd, offset, SEEK_SET) == -1) {
+            ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "lseek() failed");
+            return NGX_ERROR;
+        }
     }
 
     n = writev(file->fd, (struct iovec *) io.elts, io.nelts);
 
-    ngx_destroy_array(&io);
-
     if (n == -1) {
         ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno, "writev() failed");
         return NGX_ERROR;

src/os/unix/ngx_freebsd_sendfile_chain.c

diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index 1632424..093265a 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -83,9 +83,9 @@
 
         if (ce && (ce->hunk->type & NGX_HUNK_FILE)) {
             file = ce->hunk;
-            ce = ce->next;
             fsize = (size_t) (file->file_last - file->file_pos);
             fprev = file->file_last;
+            ce = ce->next;
 
             /* coalesce the neighbouring file hunks */