* Bumped internal version number to 6.22

* Added a new faster headers-only mode that excludes enumeration of
  MIME parts.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index edea2eb913712e0559e02cc958a5943d501b4777..93a975b61dcc451a81a63cc41f42fc5e54c4241b 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
  $Log$
+ Revision 621.13  2004/06/15 03:05:01  ajc
+ * Bumped internal version number to 6.22
+ * Added a new faster headers-only mode that excludes enumeration of
+   MIME parts.
+
  Revision 621.12  2004/06/14 19:09:26  ajc
  * serv_vandelay.c: re-inserted a missing line of code for setting tempfile
    names, which was causing exports to crash.
@@ -5838,3 +5843,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 4d2466b709c8c9c2c7d21b263beb03c82249b2d5..3b8ccd7acff319493fce16aa3f7cc2753fbc3a02 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -32,7 +32,7 @@ extern "C" {
 /*
  * Text description of this software
  */
-#define CITADEL        "Citadel/UX 6.21"
+#define CITADEL        "Citadel/UX 6.22"
 
 /*
  * REV_LEVEL is the current version number (multiplied by 100 to avoid having
@@ -44,7 +44,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      621             /* This version */
+#define REV_LEVEL      622             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 615             /* Oldest compatible export files */
 

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index d0088482c423f6ba139788cdefd8804fb4d47431..e1f3041cde89028d1ad8e93176ff004eac9dd6a3 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1343,6 +1343,7 @@ int CtdlOutputPreLoadedMsg(struct CtdlMessage *TheMessage,
 
        /* end header processing loop ... at this point, we're in the text */
 START_TEXT:
+       if (headers_only == HEADERS_FAST) goto DONE;
        mptr = TheMessage->cm_fields['M'];
 
        /* Tell the client about the MIME parts in this message */

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index cc3f3c96ff22ac330cc619b2d7d795fcfe7096ed..1d1874e45754c2e0fdec3b152c6809f2952dce9a 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -35,6 +35,7 @@ enum {
 #define HEADERS_ALL    0       /* Headers and body */
 #define        HEADERS_ONLY    1       /* Headers only */
 #define        HEADERS_NONE    2       /* Body only */
+#define HEADERS_FAST   3       /* Headers only with no MIME info */
 
 
 struct ma_info {

diff --git a/citadel/techdoc/session.txt b/citadel/techdoc/session.txt
index 8877b5162f92144aa2126c50effa731ed89420f9..14645e62b1cf811b9b289ecd116d325dfb3397e0 100644 (file)
--- a/citadel/techdoc/session.txt
+++ b/citadel/techdoc/session.txt
@@ -525,6 +525,7 @@ argument specifies whether the client wants headers and/or message body:
  0 = Headers and body
  1 = Headers only
  2 = Body only
+ 3 = Headers only, with MIME information suppressed (this runs faster)
 
  If the request is denied, ERROR + NOT_LOGGED_IN or ERROR + MESSAGE_NOT_FOUND
 will be returned.  Otherwise, LISTING_FOLLOWS will be returned, followed by