# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1040490890 0
# Node ID 79c1fce18e710388cc8a01049b10c76b1ba03b8f
# Parent  95f1c2a938f342d076da51e53c7528b24429a3a9
nginx-0.0.1-2002-12-21-20:14:50 import

diff --git a/src/core/ngx_config_file.c b/src/core/ngx_config_file.c
--- a/src/core/ngx_config_file.c
+++ b/src/core/ngx_config_file.c
@@ -183,7 +183,6 @@ int ngx_conf_read_token(ngx_conf_t *cf)
                 return NGX_ERROR;
             }
 
-            cf->conf_file.file.offset += n;
             h->pos.mem = h->start + (h->pos.mem - start);
             start = h->start;
             h->last.mem = h->pos.mem + n;
diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h
--- a/src/core/ngx_file.h
+++ b/src/core/ngx_file.h
@@ -13,6 +13,8 @@ struct ngx_file_s {
     ngx_str_t        name;
     ngx_file_info_t  info;
 
+    off_t            offset;
+
     ngx_log_t       *log;
 
     unsigned         info_valid:1;
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -16,6 +16,8 @@ ssize_t ngx_read_file(ngx_file_t *file, 
         return NGX_ERROR;
     }
 
+    file->offset += n;
+
     return n;
 }
 
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -12,5 +12,7 @@ ssize_t ngx_read_file(ngx_file_t *file, 
         return NGX_ERROR;
     }
 
+    file->offset += n;
+
     return n;
 }