Changeset 2055

Timestamp:

01/18/2008 10:54:15 AM (6 months ago)

Author:

glen

Message:

- mod_deflate: filesize check is too weak, move to new logstyle. #1512

Files:

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

trunk/src/mod_deflate.c

@@ -262 +262 @@
-                if((s->compression_level < 1 || s->compression_level > 9) &&
-                                s->compression_level != Z_DEFAULT_COMPRESSION) {
-
-
+
-                        return HANDLER_ERROR;
-                }
-
-                if(s->mem_level < 1 || s->mem_level > 9) {
-
-
+
-                        return HANDLER_ERROR;
-                }
-
-                if(s->window_size < 1 || s->window_size > 15) {
-
-
+
-                        return HANDLER_ERROR;
-                }
@@ -320 +317 @@
-        
-        if(p->conf.debug) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        }
-        if (Z_OK != (r = deflateInit2(z, 
@@ -369 +360 @@
-                        buffer_copy_memory(hctx->output, gzip_header, sizeof(gzip_header));
-                        if(p->conf.debug) {
-
-
+
-                        }
-                        /* initialize crc32 */
@@ -404 +394 @@
-
-        if(p->conf.debug) {
-
-
+
-        }
-        return st_size;
@@ -470 +459 @@
-
-        if(p->conf.debug) {
-
-
+
-        }
-        if(p->conf.sync_flush) {
@@ -508 +496 @@
-                hctx->out->bytes_in += 8;
-                if(p->conf.debug) {
-
-
+
-                }
-        }
@@ -516 +503 @@
-                if(rc == Z_DATA_ERROR) return 0;
-                if(z->msg != NULL) {
-
-
+
-                } else {
-
-
+
-                }
-                return -1;
@@ -547 +532 @@
-        
-        if(p->conf.debug) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        }
-        if (BZ_OK != BZ2_bzCompressInit(bz, 
@@ -612 +591 @@
-        } while (bz->avail_in > 0);
-        if(p->conf.debug) {
-
-
+
-        }
-        return st_size;
@@ -669 +647 @@
-        } while (bz->avail_in != 0 || !done);
-        if(p->conf.debug) {
-
-
+
-        }
-        if(p->conf.sync_flush) {
@@ -685 +662 @@
-
-        UNUSED(p);
+        UNUSED(srv);
-        UNUSED(con);
-
@@ -693 +671 @@
-        if ((rc = BZ2_bzCompressEnd(bz)) != BZ_OK) {
-                if(rc == BZ_DATA_ERROR) return 0;
-
-
+
-                return -1;
-        }
@@ -781 +758 @@
-
-        if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) {
-%s) failed: %s", 
+'%s') failed: %s",
-                                BUF_STR(c->file.name), strerror(errno));
-                return -1;
@@ -788 +765 @@
-        abs_offset = c->file.start + c->offset;
-        
-abs_offse
+c->file.length + c->file.star
-                ERROR("file '%s' was shrinked: was %lld, is %lld (%lld, %lld)", 
-abs_offse
+c->file.length + c->file.star
-                                c->file.start, c->offset);
-                
@@ -848 +825 @@
-                if (-1 == c->file.fd) {  /* open the file if not already open */
-                        if (-1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY))) {
-
-
+
-                                return -1;
-                        }
@@ -860 +836 @@
-                        /* close it here, otherwise we'd have to set FD_CLOEXEC */
-
-
-
-
+
-                        return -1;
-                }
@@ -874 +848 @@
-                if (c->file.mmap.length > (64 KByte) && 
-                    0 != madvise(c->file.mmap.start, c->file.mmap.length, MADV_WILLNEED)) {
-
-
+
-                }
-#endif
@@ -888 +861 @@
-
-        if (toSend < 0) {
-
-
-
-
-
-
+
+
+
+
+
-                assert(toSend < 0);
-        }
@@ -904 +876 @@
-
-        if(p->conf.debug) {
-
-
-
+
-        }
-        if (mod_deflate_compress(srv, con, hctx,
-                                (unsigned char *)start + (abs_offset - c->file.mmap.offset), toSend) < 0) {
-
-
+
-                return -1;
-        }
@@ -929 +898 @@
-
-        if(p->conf.debug && hctx->bytes_in < hctx->out->bytes_in) {
-(debug) compressing uri '%s' increased the sent content-size from %lld
+compressing uri '%s' increased the sent content-size from %i
-                        BUF_STR(con->uri.path_raw), hctx->bytes_in, hctx->out->bytes_in);
-        }
@@ -958 +927 @@
-        we_have = chunkqueue_length(hctx->in);
-        if (p->conf.debug) {
-
-
+
-        }
-        /* calculate max bytes to compress for this call. */
@@ -985 +953 @@
-
-                        if (mod_deflate_compress(srv, con, hctx, (unsigned char *)(c->mem->ptr + c->offset), we_want) < 0) {
-
-
+
-                                return HANDLER_ERROR;
-                        }
@@ -1000 +967 @@
-                        
-                        if ((we_want = mod_deflate_file_chunk(srv, con, hctx, c, we_want)) < 0) {
-
-
+
-                                return HANDLER_ERROR;
-                        }
@@ -1035 +1001 @@
-
-        if (p->conf.debug) {
-
-
+
-        }
-
@@ -1054 +1019 @@
-
-        if (rc < 0) {
-log_error_write(srv, __FILE__, __LINE__, "s", "flush error"
+ERROR("flush error", 0
-        }
-        
@@ -1060 +1025 @@
-                hctx->out->is_closed = 1;
-                if(p->conf.debug) {
-
-
+
-                }
-        } else {
@@ -1161 +1125 @@
-        if(!p->conf.enabled) {
-                if(p->conf.debug) {
-log_error_write(srv, __FILE__, __LINE__, "s", "compression disabled."
+TRACE("compression disabled.", 0
-                }
-                return HANDLER_GO_ON;
@@ -1201 +1165 @@
-                 */
-                /* most of buggy clients are Yahoo Slurp;) */
-
-
+
-                                (char *) inet_ntop_cache_get_ip(srv, &(con->dst_addr)));
-                return HANDLER_GO_ON;
@@ -1211 +1174 @@
-        fl = filter_chain_get_filter(con->send_filters, p->id);
-        if (!fl) {
-%s", "add deflate filter to filter chain"
+add deflate filter to filter chain", 0
-                fl = filter_chain_create_filter(con->send_filters, p->id);
-        }
@@ -1234 +1197 @@
-        if(file_len > 0 && p->conf.min_compress_size > 0 && file_len < p->conf.min_compress_size) {
-                if(p->conf.debug) {
-
-
+
-                }
-                filter_chain_remove_filter(con->send_filters, fl);
@@ -1245 +1207 @@
-                int found = 0;
-                if(p->conf.debug) {
-
-
+
-                }
-                for (m = 0; m < p->conf.mimetypes->used; m++) {
@@ -1252 +1213 @@
-
-                        if(p->conf.debug) {
-
-
+
-                        }
-                        if (strncmp(mimetype->value->ptr, ds->value->ptr, mimetype->value->used-1) == 0) {
@@ -1263 +1223 @@
-                if(!found && p->conf.mimetypes->used > 0) {
-                        if(p->conf.debug) {
-
-
+
-                        }
-                        filter_chain_remove_filter(con->send_filters, fl);
@@ -1285 +1244 @@
-                        buffer_append_string(ds->value, ",Accept-Encoding");
-                        if (p->conf.debug) {
-
-
+
-                        }
-                }
-        } else {
-                if (p->conf.debug) {
-
-
+
-                }
-                response_header_insert(srv, con, CONST_STR_LEN("Vary"),
@@ -1371 +1328 @@
-                end = 1;
-                if(p->conf.debug) {
-
-
+
-                }
-        }
-
-        if (p->conf.debug) 
-log_error_write(srv, __FILE__, __LINE__, "sdsb", "end =", end, "for uri", con->uri.path
+TRACE("end = %i for uri '%s'", end, BUF_STR(con->uri.path)
-
-        rc = deflate_compress_response(srv, con, hctx, end);
@@ -1419 +1375 @@
-
-        if(p->conf.debug && hctx->stream_open) {
-
-
+
-        }
-