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
index b2b4b810419c4b8186f389fad5953030374b9954..d161c54672caba98dce7cc286c8ac34166bb32c2 100644 (file)
--- 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
index d32c89bcddb44dbbf61046c0143f17f0ea101370..e827aff0e334896c7290f37dadc9010febeb7b3d 100644 (file)
--- 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
index 7a5caa5077199888959cadea851ef3842a87795e..c9e62b2b7c816014298592676ab1970f80b0d1bd 100644 (file)
--- 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, char *buf, size_t size, off_t offset)
         return NGX_ERROR;
     }
 
+    file->offset += n;
+
     return n;
 }
 

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index ce0d3dda07d827567cdc42ea4c1fa4c4bbd78e6a..47bf56dc58aaf5256717803094a30c092fc92ab2 100644 (file)
--- 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, char *buf, size_t size, off_t offset)
         return NGX_ERROR;
     }
 
+    file->offset += n;
+
     return n;
 }