2006-11-08 [colin] 2.6.0cvs18

	* src/etpan/imap-thread.c
		Fix bug 1054, 'Slowness logging big
		data chunks'

diff --git a/ChangeLog b/ChangeLog
index ada3953eecf6a6d5ea728cd4a119c35a3e7198d8..e85fdb42260c585acb729c218f9ff3ff3b30589b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-08 [colin]     2.6.0cvs18
+
+       * src/etpan/imap-thread.c
+               Fix bug 1054, 'Slowness logging big 
+               data chunks'
+

 2006-11-08 [paul]      2.6.0cvs17
 
        * tools/Makefile.am
 2006-11-08 [paul]      2.6.0cvs17
 
        * tools/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 5fb049eda71c6470a504e331b0230d6946f5f8c0..503a018f60ab5a578d1ea1b57f6b0420968663f4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2042,3 +2042,4 @@
 ( cvs diff -u -r 1.25.2.12 -r 1.25.2.13 tools/Makefile.am;  diff -u /dev/null tools/OOo2claws-mail.pl;  cvs diff -u -r -1.3.2.3 -r -1.3.2.4 tools/OOo2sylpheed.pl;  cvs diff -u -r 1.30.2.10 -r 1.30.2.11 tools/README;  diff -u /dev/null tools/acroread2claws-mail.pl;  cvs diff -u -r -1.1.2.5 -r -1.1.2.6 tools/acroread2sylpheed.pl;  diff -u /dev/null tools/kmail2claws-mail.pl;  diff -u /dev/null tools/kmail2claws-mail_v2.pl;  cvs diff -u -r -1.1.14.3 -r -1.1.14.4 tools/kmail2sylpheed.pl;  cvs diff -u -r -1.3.4.3 -r -1.3.4.4 tools/kmail2sylpheed_v2.pl;  diff -u /dev/null tools/maildir2claws-mail.pl;  cvs diff -u -r -1.2.2.2 -r -1.2.2.3 tools/maildir2sylpheed.pl;  diff -u /dev/null tools/nautilus2claws-mail.sh;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 tools/nautilus2sylpheed.sh;  diff -u /dev/null tools/outlook2claws-mail.pl;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 tools/outlook2sylpheed.pl;  diff -u /dev/null tools/tb2claws-mail;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 tools/tb2sylpheed;  diff -u /dev/null tools/tbird2claws.py;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 tools/tbird2syl.py;  diff -u /dev/null tools/kdeservicemenu/claws-mail-kdeservicemenu.pl;  cvs diff -u -r 1.2.2.3 -r 1.2.2.4 tools/kdeservicemenu/install.sh;  cvs diff -u -r -1.5.2.4 -r -1.5.2.5 tools/kdeservicemenu/sylpheed-kdeservicemenu.pl;  diff -u /dev/null tools/kdeservicemenu/template_claws-mail-attach-files.desktop;  diff -u /dev/null tools/kdeservicemenu/template_claws-mail-compress-attach.desktop;  cvs diff -u -r -1.3.2.7 -r -1.3.2.8 tools/kdeservicemenu/template_sylpheed-attach-files.desktop;  cvs diff -u -r -1.3.2.7 -r -1.3.2.8 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop;  ) > 2.6.0cvs15.patchset
 ( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/common/defs.h;  ) > 2.6.0cvs16.patchset
 ( cvs diff -u -r 1.25.2.13 -r 1.25.2.14 tools/Makefile.am;  ) > 2.6.0cvs17.patchset
 ( cvs diff -u -r 1.25.2.12 -r 1.25.2.13 tools/Makefile.am;  diff -u /dev/null tools/OOo2claws-mail.pl;  cvs diff -u -r -1.3.2.3 -r -1.3.2.4 tools/OOo2sylpheed.pl;  cvs diff -u -r 1.30.2.10 -r 1.30.2.11 tools/README;  diff -u /dev/null tools/acroread2claws-mail.pl;  cvs diff -u -r -1.1.2.5 -r -1.1.2.6 tools/acroread2sylpheed.pl;  diff -u /dev/null tools/kmail2claws-mail.pl;  diff -u /dev/null tools/kmail2claws-mail_v2.pl;  cvs diff -u -r -1.1.14.3 -r -1.1.14.4 tools/kmail2sylpheed.pl;  cvs diff -u -r -1.3.4.3 -r -1.3.4.4 tools/kmail2sylpheed_v2.pl;  diff -u /dev/null tools/maildir2claws-mail.pl;  cvs diff -u -r -1.2.2.2 -r -1.2.2.3 tools/maildir2sylpheed.pl;  diff -u /dev/null tools/nautilus2claws-mail.sh;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 tools/nautilus2sylpheed.sh;  diff -u /dev/null tools/outlook2claws-mail.pl;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 tools/outlook2sylpheed.pl;  diff -u /dev/null tools/tb2claws-mail;  cvs diff -u -r -1.2.2.3 -r -1.2.2.4 tools/tb2sylpheed;  diff -u /dev/null tools/tbird2claws.py;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 tools/tbird2syl.py;  diff -u /dev/null tools/kdeservicemenu/claws-mail-kdeservicemenu.pl;  cvs diff -u -r 1.2.2.3 -r 1.2.2.4 tools/kdeservicemenu/install.sh;  cvs diff -u -r -1.5.2.4 -r -1.5.2.5 tools/kdeservicemenu/sylpheed-kdeservicemenu.pl;  diff -u /dev/null tools/kdeservicemenu/template_claws-mail-attach-files.desktop;  diff -u /dev/null tools/kdeservicemenu/template_claws-mail-compress-attach.desktop;  cvs diff -u -r -1.3.2.7 -r -1.3.2.8 tools/kdeservicemenu/template_sylpheed-attach-files.desktop;  cvs diff -u -r -1.3.2.7 -r -1.3.2.8 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop;  ) > 2.6.0cvs15.patchset
 ( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/common/defs.h;  ) > 2.6.0cvs16.patchset
 ( cvs diff -u -r 1.25.2.13 -r 1.25.2.14 tools/Makefile.am;  ) > 2.6.0cvs17.patchset

+( cvs diff -u -r 1.1.4.56 -r 1.1.4.57 src/etpan/imap-thread.c;  ) > 2.6.0cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 610322a46b5f449c92ad06978a8032f3f54e5582..a0544871c9c8b6c28310e0194ee3c7099a0b2e06 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=17
+EXTRA_VERSION=18

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index fb38a1ac11fd1bbb69a1538debc60ddddb679cb0..a26d736cb31f455bbd1f8788cb51430bc65a95a9 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -47,6 +47,10 @@ static void imap_logger_cmd(int direction, const char * str, size_t size)
        gchar **lines;
        int i = 0;
 
        gchar **lines;
        int i = 0;
 

+       if (size > 8192) {
+               log_print("IMAP4%c [CMD data - %zd bytes]\n", direction?'>':'<', size);
+               return;
+       }

        buf = malloc(size+1);
        memset(buf, 0, size+1);
        strncpy(buf, str, size);
        buf = malloc(size+1);
        memset(buf, 0, size+1);
        strncpy(buf, str, size);


@@ -78,6 +82,11 @@ static void imap_logger_fetch(int direction, const char * str, size_t size)
        gchar **lines;
        int i = 0;
 
        gchar **lines;
        int i = 0;
 

+       if (size > 8192) {
+               log_print("IMAP4%c [FETCH data - %zd bytes]\n", direction?'>':'<', size);
+               return;
+       }
+       

        buf = malloc(size+1);
        memset(buf, 0, size+1);
        strncpy(buf, str, size);
        buf = malloc(size+1);
        memset(buf, 0, size+1);
        strncpy(buf, str, size);


@@ -112,6 +121,10 @@ static void imap_logger_uid(int direction, const char * str, size_t size)
        gchar **lines;
        int i = 0;
 
        gchar **lines;
        int i = 0;
 

+       if (size > 8192) {
+               log_print("IMAP4%c [UID data - %zd bytes]\n", direction?'>':'<', size);
+               return;
+       }

        buf = malloc(size+1);
        memset(buf, 0, size+1);
        strncpy(buf, str, size);
        buf = malloc(size+1);
        memset(buf, 0, size+1);
        strncpy(buf, str, size);


@@ -150,6 +163,10 @@ void imap_logger_append(int direction, const char * str, size_t size)
        gchar **lines;
        int i = 0;
 
        gchar **lines;
        int i = 0;
 

+       if (size > 8192) {
+               log_print("IMAP4%c [APPEND data - %zd bytes]\n", direction?'>':'<', size);
+               return;
+       }

        buf = malloc(size+1);
        memset(buf, 0, size+1);
        strncpy(buf, str, size);
        buf = malloc(size+1);
        memset(buf, 0, size+1);
        strncpy(buf, str, size);