|
|
5c17098 |
diff -up cyrus-imapd-2.3.15/lib/prot.c.nodebug cyrus-imapd-2.3.15/lib/prot.c
|
|
|
5c17098 |
--- cyrus-imapd-2.3.15/lib/prot.c.nodebug 2009-11-05 14:20:53.845020152 +0100
|
|
|
5c17098 |
+++ cyrus-imapd-2.3.15/lib/prot.c 2009-11-05 14:21:35.932145246 +0100
|
|
|
5c17098 |
@@ -329,7 +329,7 @@ static int is_incompressible(const char
|
|
|
5c17098 |
|
|
|
5c17098 |
while (sig->type) {
|
|
|
5c17098 |
if (n >= sig->len && !memcmp(p, sig->sig, sig->len)) {
|
|
|
5c17098 |
- syslog(LOG_DEBUG, "data is %s", sig->type);
|
|
|
5c17098 |
+// syslog(LOG_DEBUG, "data is %s", sig->type);
|
|
|
5c17098 |
return 1;
|
|
|
5c17098 |
}
|
|
|
5c17098 |
sig++;
|
|
|
5c17098 |
@@ -642,14 +642,14 @@ int prot_fill(struct protstream *s)
|
|
|
5c17098 |
s->zstrm->next_out = s->zbuf;
|
|
|
5c17098 |
s->zstrm->avail_out = s->zbuf_size;
|
|
|
5c17098 |
|
|
|
5c17098 |
- syslog(LOG_DEBUG, "inflate(%d bytes)", s->cnt);
|
|
|
5c17098 |
+// syslog(LOG_DEBUG, "inflate(%d bytes)", s->cnt);
|
|
|
5c17098 |
|
|
|
5c17098 |
do {
|
|
|
5c17098 |
if (!s->zstrm->avail_out) {
|
|
|
5c17098 |
/* Need more space to decompress */
|
|
|
5c17098 |
- syslog(LOG_DEBUG,
|
|
|
5c17098 |
- "growing decompress buffer from %d to %d bytes",
|
|
|
5c17098 |
- s->zbuf_size, s->zbuf_size + PROT_BUFSIZE);
|
|
|
5c17098 |
+// syslog(LOG_DEBUG,
|
|
|
5c17098 |
+// "growing decompress buffer from %d to %d bytes",
|
|
|
5c17098 |
+// s->zbuf_size, s->zbuf_size + PROT_BUFSIZE);
|
|
|
5c17098 |
|
|
|
5c17098 |
s->zbuf = (unsigned char *)
|
|
|
5c17098 |
xrealloc(s->zbuf, s->zbuf_size + PROT_BUFSIZE);
|
|
|
5c17098 |
@@ -670,7 +670,7 @@ int prot_fill(struct protstream *s)
|
|
|
5c17098 |
s->ptr = s->zbuf;
|
|
|
5c17098 |
s->cnt = s->zbuf_size - s->zstrm->avail_out;
|
|
|
5c17098 |
|
|
|
5c17098 |
- syslog(LOG_DEBUG, " => decompressed to %d bytes", s->cnt);
|
|
|
5c17098 |
+// syslog(LOG_DEBUG, " => decompressed to %d bytes", s->cnt);
|
|
|
5c17098 |
}
|
|
|
5c17098 |
#endif /* HAVE_ZLIB */
|
|
|
5c17098 |
|
|
|
5c17098 |
@@ -760,8 +760,8 @@ static int prot_flush_encode(struct prot
|
|
|
5c17098 |
* Oversize the buffer, so we (hopefully) eliminate
|
|
|
5c17098 |
* multiple small incremental reallocations.
|
|
|
5c17098 |
*/
|
|
|
5c17098 |
- syslog(LOG_DEBUG, "growing compress buffer from %u to %lu bytes",
|
|
|
5c17098 |
- s->zbuf_size, def_size + PROT_BUFSIZE);
|
|
|
5c17098 |
+// syslog(LOG_DEBUG, "growing compress buffer from %u to %lu bytes",
|
|
|
5c17098 |
+// s->zbuf_size, def_size + PROT_BUFSIZE);
|
|
|
5c17098 |
|
|
|
5c17098 |
s->zbuf_size = def_size + PROT_BUFSIZE;
|
|
|
5c17098 |
s->zbuf = (unsigned char *) xrealloc(s->zbuf, s->zbuf_size);
|
|
|
5c17098 |
@@ -772,9 +772,9 @@ static int prot_flush_encode(struct prot
|
|
|
5c17098 |
s->zstrm->next_out = s->zbuf;
|
|
|
5c17098 |
s->zstrm->avail_out = s->zbuf_size;
|
|
|
5c17098 |
|
|
|
5c17098 |
- syslog(LOG_DEBUG, "deflate(%d bytes, level=%d, flush=%s)",
|
|
|
5c17098 |
- left, s->zlevel,
|
|
|
5c17098 |
- zflush == Z_FULL_FLUSH ? "FULL" : "SYNC");
|
|
|
5c17098 |
+// syslog(LOG_DEBUG, "deflate(%d bytes, level=%d, flush=%s)",
|
|
|
5c17098 |
+// left, s->zlevel,
|
|
|
5c17098 |
+// zflush == Z_FULL_FLUSH ? "FULL" : "SYNC");
|
|
|
5c17098 |
|
|
|
5c17098 |
if (s->boundary) {
|
|
|
5c17098 |
/* Set (new) compression level */
|
|
|
5c17098 |
@@ -791,7 +791,7 @@ static int prot_flush_encode(struct prot
|
|
|
5c17098 |
ptr = s->zbuf;
|
|
|
5c17098 |
left = s->zbuf_size - s->zstrm->avail_out;
|
|
|
5c17098 |
|
|
|
5c17098 |
- syslog(LOG_DEBUG, " => compressed to %d bytes", left);
|
|
|
5c17098 |
+// syslog(LOG_DEBUG, " => compressed to %d bytes", left);
|
|
|
5c17098 |
}
|
|
|
5c17098 |
#endif /* HAVE_ZLIB */
|
|
|
5c17098 |
|