* Fixed a wrap bug in convert_internet_message()

* This also is backported to stable, which is now 7.84

diff --git a/citadel/citadel.h b/citadel/citadel.h
index d519766a7b5dd70599019292e0cbf9aff5bf44f9..7698db15e24cd090c4584d0be0c50ca94d5a6bdd 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -53,7 +53,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      783             /* This version */
+#define REV_LEVEL      784             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 760             /* Oldest compatible export files */
 #define LIBCITADEL_MIN 781             /* Minimum required version of libcitadel */

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 23e7d203b27d8e74f9b516395d5a63183c12cf98..744558038b698e10405d7d60a5eb781cdf7bf997 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.83], [http://www.citadel.org/])
+AC_INIT([Citadel], [7.84], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_CONFIG_HEADER(sysdep.h)

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 7a9f4b07816810967e106731f4e2781ddb675c36..8bfdd6a1c952adf9b36fc650fc83f71e0845e439 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -779,8 +779,7 @@ struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822)
                       (done == 0) ) 
                {
 
-                       if ((*pos=='\n') &&
-                           (!isspace(*(pos+1)))) 
+                       if ( (*pos=='\n') && ((*pos+1)!=0x20) && ((*pos+1)!=0x09) )
                        {
                                end = pos;
                        }