nginx-0.0.1-2003-05-23-15:53:01 import

3 files changed, 9 insertions, 27 deletions

diff --git a/src/os/unix/ngx_aio_write_chain.c b/src/os/unix/ngx_aio_write_chain.c
index 14586ce40..b12afec41 100644
--- a/src/os/unix/ngx_aio_write_chain.c
+++ b/src/os/unix/ngx_aio_write_chain.c
@@ -17,9 +17,6 @@ ngx_chain_t *ngx_aio_write_chain(ngx_connection_t *c, ngx_chain_t *in)
     ce = in;
 
     while (ce) {
-
-ngx_log_debug(c->log, "aio_write ce: %x" _ ce->hunk->pos);
-
         buf = prev = ce->hunk->pos;
         size = 0;
 
@@ -32,7 +29,9 @@ ngx_log_debug(c->log, "aio_write ce: %x" _ ce->hunk->pos);
 
         rc = ngx_aio_write(c, buf, size);
 
-ngx_log_debug(c->log, "aio_write rc: %d" _ rc);
+#if (NGX_DEBUG_WRITE_CHAIN)
+        ngx_log_debug(c->log, "aio_write rc: %d" _ rc);
+#endif
 
         if (rc > 0) {
             sent += rc;
@@ -52,31 +51,14 @@ ngx_log_debug(c->log, "aio_write rc: %d" _ rc);
 
     for (ce = in; ce; ce = ce->next) {
 
-#if (NGX_DEBUG_WRITE_CHAIN)
-        ngx_log_debug(c->log, "write chain: %x %qx %qd" _
-                      ce->hunk->type _
-                      ce->hunk->file_pos _
-                      ce->hunk->file_last - ce->hunk->file_pos);
-#endif
-
-        if (sent >= ce->hunk->file_last - ce->hunk->file_pos) {
-            sent -= ce->hunk->file_last - ce->hunk->file_pos;
-            ce->hunk->file_pos = ce->hunk->file_last;
+        if (sent >= ce->hunk->last - ce->hunk->pos) {
+            sent -= ce->hunk->last - ce->hunk->pos;
+            ce->hunk->pos = ce->hunk->last;
 
-#if (NGX_DEBUG_WRITE_CHAIN)
-            ngx_log_debug(c->log, "write chain done: %qx %qd" _
-                          ce->hunk->file_pos _ sent);
-#endif
             continue;
         }
 
-        ce->hunk->file_pos += sent;
-
-#if (NGX_DEBUG_WRITE_CHAIN)
-        ngx_log_debug(c->log, "write chain rest: %qx %qd" _
-                      ce->hunk->file_pos _
-                      ce->hunk->file_last - ce->hunk->file_pos);
-#endif
+        ce->hunk->pos += sent;
 
         break;
     }
diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h
index 3f6be6cbb..b9802817b 100644
--- a/src/os/unix/ngx_errno.h
+++ b/src/os/unix/ngx_errno.h
@@ -10,7 +10,7 @@ typedef int               ngx_err_t;
 #define NGX_ENOENT        ENOENT
 #define NGX_EINTR         EINTR
 #define NGX_EACCES        EACCES
-#define NGX_EEXIST        EEXIST 
+#define NGX_EEXIST        EEXIST
 #define NGX_ENOTDIR       ENOTDIR
 #define NGX_EAGAIN        EWOULDBLOCK
 #define NGX_EINPROGRESS   EINPROGRESS
diff --git a/src/os/unix/ngx_time.c b/src/os/unix/ngx_time.c
index 26ef6462d..12256e13a 100644
--- a/src/os/unix/ngx_time.c
+++ b/src/os/unix/ngx_time.c
@@ -28,7 +28,7 @@ typedef struct {
     time_t sec;
     tm;
     http_time_len;
-    http_time[n];    
+    http_time[n];
 };
 
 volatile *ngx_time_p;