Changeset 1604

Timestamp:

02/04/2007 09:42:53 PM (20 months ago)

Author:

jan

Message:

increment c->offset only once

Files:

• trunk/src/mod_deflate.c (modified) (4 diffs)

trunk/src/mod_deflate.c

@@ -784 +784 @@
         
         if (abs_offset > sce->st.st_size) {
-                log_error_write(srv, __FILE__, __LINE__, "sb", 
-                                "file was shrinked:", c->file.name);
+                ERROR("file '%s' was shrinked: was %lld, is %lld (%lld, %lld)", 
+                                BUF_STR(c->file.name), abs_offset, sce->st.st_size,
+                                c->file.start, c->offset);
                 
                 return -1;
@@ -909 +910 @@
         }
 
-        c->offset += toSend;
-        if (c->offset == c->file.length) {
-                /* we don't need the mmaping anymore */
-                if (c->file.mmap.start != MAP_FAILED) {
-                        munmap(c->file.mmap.start, c->file.mmap.length);
-                        c->file.mmap.start = MAP_FAILED;
-                }
-        }
-
         return toSend;
 }
@@ -1015 +1007 @@
                 out += we_want;
                 max -= we_want;
+        
+                if (c->type == FILE_CHUNK && 
+                    c->offset == c->file.length &&
+                    c->file.mmap.start != MAP_FAILED) {
+                        /* we don't need the mmaping anymore */
+                        munmap(c->file.mmap.start, c->file.mmap.length);
+                        c->file.mmap.start = MAP_FAILED;
+                }
+
                 if (we_have == we_want) {
                         /* chunk finished */
@@ -1034 +1035 @@
         /* check if we finished compressing all the content. */
         end = (hctx->in->is_closed && hctx->in->bytes_in == hctx->in->bytes_out);
+
+        if (p->conf.debug) {
+                TRACE("end: %d - %lld - %lld", hctx->in->is_closed, hctx->in->bytes_in, hctx->in->bytes_out);
+        }
 
         /* flush the output buffer to make room for more data. */