Changeset 2033

Timestamp:

01/15/2008 11:59:25 PM (8 months ago)

Author:

glen

Message:

- chunk.c patches from #1510

Location:

trunk/src

Files:

• chunk.c (modified) (5 diffs)
• chunk.h (modified) (1 diff)
• mod_cgi.c (modified) (1 diff)
• mod_chunked.c (modified) (2 diffs)
• mod_deflate.c (modified) (5 diffs)
• mod_magnet.c (modified) (1 diff)
• mod_proxy.c (modified) (1 diff)
• mod_proxy_core.c (modified) (1 diff)
• mod_scgi.c (modified) (1 diff)

trunk/src/chunk.c

@@ -295 +295 @@
         c->type = FILE_CHUNK;
         buffer_copy_string_buffer(c->file.name, in->file.name);
-        c->file.start = in->offset;
-        c->file.length = in->file.length - c->file.start - in->offset;
+        c->file.start = in->file.start + in->offset;
+        c->file.length = in->file.length - in->offset;
         c->offset = 0;
         c->file.is_temp = 1;
@@ -307 +307 @@
 
 /**
- * move the content of chunk to another chunkqueue
- */
-int chunkqueue_steal_chunk(chunkqueue *cq, chunk *c) {
+ * move the content of chunk to another chunkqueue. return total bytes copied/stolen.
+ */
+off_t chunkqueue_steal_chunk(chunkqueue *cq, chunk *c) {
         /* we are copying the whole buffer, just steal it */
-        size_t len;
-        char *s;
-        buffer *b;
+        off_t total = 0;
+        buffer *b, btmp;
 
         if (!cq) return 0;
-
-        assert(c->type == MEM_CHUNK);
-
-        b = chunkqueue_get_append_buffer(cq);
-
-        /* swap len, alloced-size and pointer */
-        len = b->used;
-        b->used = c->mem->used;
-        c->mem->used = len;
-
-        len = b->size;
-        b->size = c->mem->size;
-        c->mem->size = len;
-
-        s = b->ptr;
-        b->ptr = c->mem->ptr;
-        c->mem->ptr = s;
-
-        chunk_set_done(c); /* mark the old chunk as read */
-
-        return 0;
+        if (chunk_is_done(c)) return 0;
+
+        switch (c->type) {
+        case MEM_CHUNK:
+                total = c->mem->used - c->offset - 1;
+                if (c->offset == 0) {
+                        b = chunkqueue_get_append_buffer(cq);
+                        btmp = *b; *b = *(c->mem); *(c->mem) = btmp;
+                } else {
+                        chunkqueue_append_mem(cq, c->mem->ptr + c->offset, total);
+                        chunk_set_done(c);
+                }
+                break;
+        case FILE_CHUNK:
+                total = c->file.length - c->offset;
+
+                if (c->file.is_temp) {
+                        chunkqueue_steal_tempfile(cq, c);
+                } else {
+                        chunkqueue_append_file(cq, c->file.name, c->file.start + c->offset, c->file.length - c->offset);
+                        chunk_set_done(c);
+                }
+
+                break;
+        case UNUSED_CHUNK:
+                return 0;
+        }
+
+        return total;
 }
 
@@ -350 +357 @@
 
         for (c = in->first; c; c = c->next) {
-                off_t we_have = 0;
-
-                /* is there something to move ? */
-                if (chunk_is_done(c)) continue;
-
-                switch (c->type) {
-                case MEM_CHUNK:
-                        we_have = c->mem->used - c->offset - 1;
-                        
-                        if (c->offset == 0) {
-                                chunkqueue_steal_chunk(cq, c);
-                        } else {
-                                chunkqueue_append_buffer(cq, c->mem);
-                        }
-                        break;
-                case FILE_CHUNK:
-                        we_have = c->file.length - c->offset;
-
-                        if (c->file.is_temp) {
-                                chunkqueue_steal_tempfile(cq, c);
-                        } else {
-                                chunkqueue_append_file(cq, c->file.name, c->file.start, c->file.length);
-                        }
-
-                        break;
-                case UNUSED_CHUNK:
-                        break;
-                }
-                
-                chunk_set_done(c);
-
-                total += we_have;
+                total += chunkqueue_steal_chunk(cq, c);
         }
 
@@ -450 +426 @@
                         we_want = we_have < max_len ? we_have : max_len;
         
-                        if (c->offset == 0 && we_have == we_want) {
+                        if (we_have == we_want) {
                                 /* steal whole chunk */
                                 chunkqueue_steal_chunk(out, c);
@@ -541 +517 @@
         c->type = MEM_CHUNK;
         c->offset = 0;
-        buffer_copy_string_len(c->mem, mem, len - 1);
+        buffer_copy_string_len(c->mem, mem, len);
 
         chunkqueue_append_chunk(cq, c);

trunk/src/chunk.h

@@ -68 +68 @@
 LI_API chunk * chunkqueue_get_append_tempfile(chunkqueue *cq);
 LI_API int chunkqueue_steal_tempfile(chunkqueue *cq, chunk *in);
-LI_API int chunkqueue_steal_chunk(chunkqueue *cq, chunk *c);
+LI_API off_t chunkqueue_steal_chunk(chunkqueue *cq, chunk *c);
 LI_API off_t chunkqueue_steal_chunks_len(chunkqueue *cq, chunk *c, off_t max_len);
 LI_API off_t chunkqueue_steal_all_chunks(chunkqueue *cq, chunkqueue *in);

trunk/src/mod_cgi.c

@@ -258 +258 @@
                 if (c->mem->used == 0) continue;
 
-                we_have = c->mem->used - c->offset - 1;
+                we_have = chunkqueue_steal_chunk(con->send, c);
                 sess->rb->bytes_out += we_have;
                 con->send->bytes_in += we_have;
-                if (c->offset == 0) {
-                        /* steal the buffer from the previous queue */
-
-                        chunkqueue_steal_chunk(con->send, c);
-                } else {
-                        chunkqueue_append_mem(con->send, c->mem->ptr + c->offset, c->mem->used - c->offset);
-
-                        c->offset = c->mem->used - 1; /* mark the incoming side as read */
-                }
         }
         chunkqueue_remove_finished_chunks(sess->rb);

trunk/src/mod_chunked.c

@@ -336 +336 @@
                         break;
                 }
-                chunkqueue_append_mem(out, "\r\n", 2 + 1);
+                chunkqueue_append_mem(out, CONST_STR_LEN("\r\n"));
                 we_have += 2;
                 out->bytes_in += we_have;
@@ -343 +343 @@
         /* terminate the last chunk */
         if (in->is_closed) {
-                chunkqueue_append_mem(out, "0\r\n\r\n", 5 + 1);
+                chunkqueue_append_mem(out, CONST_STR_LEN("0\r\n\r\n"));
                 out->bytes_in += 5;
         }

trunk/src/mod_deflate.c

@@ -396 +396 @@
                         len = hctx->output->size - z->avail_out;
                         out += len;
-                        chunkqueue_append_mem(hctx->out, hctx->output->ptr, len+1);
+                        chunkqueue_append_mem(hctx->out, hctx->output->ptr, len);
                         hctx->out->bytes_in += len;
                         z->next_out = (unsigned char *)hctx->output->ptr;
@@ -461 +461 @@
                 if(z->avail_out == 0 || (flush && len > 0)) {
                         out += len;
-                        chunkqueue_append_mem(hctx->out, hctx->output->ptr, len+1);
+                        chunkqueue_append_mem(hctx->out, hctx->output->ptr, len);
                         hctx->out->bytes_in += len;
                         z->next_out = (unsigned char *)hctx->output->ptr;
@@ -505 +505 @@
                 c[7] = (z->total_in >> 24) & 0xff;
                 /* append footer to write_queue */
-                chunkqueue_append_mem(hctx->out, (char *)c, 9);
+                chunkqueue_append_mem(hctx->out, (char *)c, 8);
                 hctx->out->bytes_in += 8;
                 if(p->conf.debug) {
@@ -605 +605 @@
                         len = hctx->output->size - bz->avail_out;
                         out += len;
-                        chunkqueue_append_mem(hctx->out, hctx->output->ptr, len+1);
+                        chunkqueue_append_mem(hctx->out, hctx->output->ptr, len);
                         hctx->out->bytes_in += len;
                         bz->next_out = hctx->output->ptr;
@@ -662 +662 @@
                 if(bz->avail_out == 0 || (flush && len > 0)) {
                         out += len;
-                        chunkqueue_append_mem(hctx->out, hctx->output->ptr, len+1);
+                        chunkqueue_append_mem(hctx->out, hctx->output->ptr, len);
                         hctx->out->bytes_in += len;
                         bz->next_out = hctx->output->ptr;

trunk/src/mod_magnet.c

@@ -585 +585 @@
                                 const char *s = lua_tolstring(L, -1, &s_len);
 
-                                chunkqueue_append_mem(con->send, s, s_len + 1);
+                                chunkqueue_append_mem(con->send, s, s_len);
                         } else if (lua_istable(L, -1)) {
                                 lua_getfield(L, -1, "filename");

trunk/src/mod_proxy.c

@@ -679 +679 @@
 
         /* copy the content to the next cq */
-        for (c = hctx->rb->first; c; c = c->next) {
-                chunkqueue_append_mem(con->send, c->mem->ptr + c->offset, c->mem->used - c->offset);
-
-                c->offset = c->mem->used - 1;
-        }
+        chunkqueue_steal_all_chunks(con->send, hctx->rb);
 
         chunkqueue_remove_finished_chunks(hctx->rb);

trunk/src/mod_proxy_core.c

@@ -527 +527 @@
                         con->send->bytes_in += we_have;
                         /* X-Sendfile ignores the content-body */
-                        if (c->offset == 0) {
-                                /* steal the buffer from the previous queue */
-
-                                chunkqueue_steal_chunk(con->send, c);
-                        } else {
-                                chunkqueue_append_mem(con->send, c->mem->ptr + c->offset, c->mem->used - c->offset);
-
-                                c->offset = c->mem->used - 1; /* mark the incoming side as read */
-                        }
+                        chunkqueue_steal_chunk(con->send, c);
                 } else {
                         /* discard the data */
-                        c->offset = c->mem->used - 1; /* mark the incoming side as read */
+                        chunk_set_done(c);
                 }
         }

trunk/src/mod_scgi.c

@@ -1737 +1737 @@
 
         /* copy the content to the next cq */
-        for (c = hctx->rb->first; c; c = c->next) {
-                chunkqueue_append_mem(con->send, c->mem->ptr + c->offset, c->mem->used - c->offset);
-
-                c->offset = c->mem->used - 1;
-        }
+        chunkqueue_steal_all_chunks(con->send, hctx->rb);
 
         chunkqueue_remove_finished_chunks(hctx->rb);