Mercurial > hg > nginx

changeset 35:79c1fce18e71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2002-12-21-20:14:50 import
author Igor Sysoev <igor@sysoev.ru>
date Sat, 21 Dec 2002 17:14:50 +0000
parents 95f1c2a938f3
children c14d7232b11f
files src/core/ngx_config_file.c src/core/ngx_file.h src/os/unix/ngx_files.c src/os/win32/ngx_files.c
diffstat 4 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;
--- 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;
 }
 
--- 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;
 }