* Fix missing protocol header when outputing messages in "body only" mode

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 5abb38919e1d74ccd5613300602c7327c3858c60..d883258fafaf39dec9dfe2eb3000d17fea2e02fd 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.05"
+#define CITADEL        "Citadel/UX 6.06"
 
 /*
  * REV_LEVEL is the current version number (multiplied by 100 to avoid having
@@ -41,7 +41,7 @@ extern "C" {
  * are older than REV_MIN, none of the programs will work until the setup
  * program is run again to bring things up to date.
  */
-#define REV_LEVEL      605             /* This version */
+#define REV_LEVEL      606             /* This version */
 #define REV_MIN                591             /* Oldest compatible version */
 
 #define SERVER_TYPE 0  /* zero for stock Citadel/UX; other developers please

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index aaf901b3c12113346ffc3e816ed9e40bcf8eff07..6d6f8313e8eb4671acd69f67246335b06f69a722 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1144,12 +1144,12 @@ int CtdlOutputPreLoadedMsg(struct CtdlMessage *TheMessage,
                return((CC->download_fp != NULL) ? om_ok : om_mime_error);
        }
 
-       /* Does the caller want to skip the headers? */
-       if (headers_only == HEADERS_NONE) goto START_TEXT;
-
        /* now for the user-mode message reading loops */
        if (do_proto) cprintf("%d Message %ld:\n", LISTING_FOLLOWS, msg_num);
 
+       /* Does the caller want to skip the headers? */
+       if (headers_only == HEADERS_NONE) goto START_TEXT;
+
        /* Tell the client which format type we're using. */
        if ( (mode == MT_CITADEL) && (do_proto) ) {
                cprintf("type=%d\n", TheMessage->cm_format_type);