2008-12-15 [colin] 3.6.1cvs77

	* src/common/utils.c
		Fix bug 1746, 'Makes a mailto link from several
		paragraphs'

diff --git a/ChangeLog b/ChangeLog
index 8c5430d251fc8c98244af2d7a1142ecb6625aea8..dcc48ebdcfca314512fd89612cae8ca6636f0787 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-15 [colin]     3.6.1cvs77
+
+       * src/common/utils.c
+               Fix bug 1746, 'Makes a mailto link from several 
+               paragraphs'
+
 2008-12-15 [paul]      3.6.1cvs76
 
        * m4/spamassassin.m4

diff --git a/PATCHSETS b/PATCHSETS
index b8e5821146ada7f63f6b633c989ecfd7f425a139..6c72706344f287a5d8b8bc12de7ced46a4e06d5a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3658,3 +3658,4 @@
 ( cvs diff -u -r 1.25.2.29 -r 1.25.2.30 tools/Makefile.am;  ) > 3.6.1cvs74.patchset
 ( cvs diff -u -r 1.24.2.24 -r 1.24.2.25 Makefile.am;  cvs diff -u -r 1.155.2.94 -r 1.155.2.95 src/Makefile.am;  cvs diff -u -r 1.9.2.38 -r 1.9.2.39 src/common/ssl.c;  cvs diff -u -r 1.36.2.156 -r 1.36.2.157 src/common/utils.c;  cvs diff -u -r 1.20.2.64 -r 1.20.2.65 src/common/utils.h;  cvs diff -u -r 1.25.2.30 -r 1.25.2.31 tools/Makefile.am;  ) > 3.6.1cvs75.patchset
 ( cvs diff -u -r 1.1.4.3 -r 1.1.4.4 m4/spamassassin.m4;  ) > 3.6.1cvs76.patchset
+( cvs diff -u -r 1.36.2.157 -r 1.36.2.158 src/common/utils.c;  ) > 3.6.1cvs77.patchset

diff --git a/configure.ac b/configure.ac
index eb98e6896281c8ec5638d6c6b68dee6cbd6ab920..61409da53829bade5d0325b3bc5fe646d3035e01 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=76
+EXTRA_VERSION=77
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index f4e72e9085ac5d1bea8a05568533653c34a998cd..56b9072ac2175d4fcc006ef26bb6c4142cbd919d 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -4476,7 +4476,7 @@ search_again:
                        POP_STACK();
                        continue;
                }
-               if (*bp_ == '\'' || *bp_ == '"') {
+               if (!IN_STACK() && (*bp_ == '\'' || *bp_ == '"')) {
                        PUSH_STACK(*bp_);
                        continue;
                }