From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/45780
Path: main.gmane.org!not-for-mail
From: Hrvoje Niksic <hniksic@xemacs.org>
Newsgroups: gmane.emacs.gnus.general
Subject: Non-MML forwarding strips Content-Transfer-Encoding
Date: Tue, 23 Jul 2002 15:47:21 +0200
Sender: owner-ding@hpc.uh.edu
Message-ID: <sxsk7nmimja.fsf@florida.munich.redhat.com>
NNTP-Posting-Host: localhost.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: main.gmane.org 1027432098 16668 127.0.0.1 (23 Jul 2002 13:48:18 GMT)
X-Complaints-To: usenet@main.gmane.org
NNTP-Posting-Date: Tue, 23 Jul 2002 13:48:18 +0000 (UTC)
Return-path: <owner-ding@hpc.uh.edu>
Original-Received: from malifon.math.uh.edu ([129.7.128.13])
	by main.gmane.org with esmtp (Exim 3.33 #1 (Debian))
	id 17X01R-0004Kj-00
	for <ding-account@gmane.org>; Tue, 23 Jul 2002 15:48:17 +0200
Original-Received: from sina.hpc.uh.edu ([129.7.128.10] ident=lists)
	by malifon.math.uh.edu with esmtp (Exim 3.20 #1)
	id 17X01B-0002NZ-00; Tue, 23 Jul 2002 08:48:01 -0500
Original-Received: by sina.hpc.uh.edu (TLB v0.09a (1.20 tibbs 1996/10/09 22:03:07)); Tue, 23 Jul 2002 08:48:26 -0500 (CDT)
Original-Received: from sclp3.sclp.com (qmailr@sclp3.sclp.com [209.196.61.66])
	by sina.hpc.uh.edu (8.9.3/8.9.3) with SMTP id IAA21063
	for <ding@hpc.uh.edu>; Tue, 23 Jul 2002 08:48:15 -0500 (CDT)
Original-Received: (qmail 29719 invoked by alias); 23 Jul 2002 13:47:46 -0000
Original-Received: (qmail 29714 invoked from network); 23 Jul 2002 13:47:45 -0000
Original-Received: from h-213.61.75.77.host.de.colt.net (HELO florida.munich.redhat.com) (213.61.75.77)
  by gnus.org with SMTP; 23 Jul 2002 13:47:45 -0000
Original-Received: from hniksic by florida.munich.redhat.com with local (Exim 3.35 #1 (Debian))
	id 17X00X-0001Dv-00
	for <ding@gnus.org>; Tue, 23 Jul 2002 15:47:21 +0200
Original-To: ding@gnus.org
X-Attribution: Hrvoje
X-Face: &{dT~)Pu6V<0y?>3p$;@vh\`C7xB~A0T-J%Og)J,@-1%q6Q+,
        gs<-9M#&`I8cJp2b1{vPE|~+JE+gx;a7%BG{}nY^ehK1"q#rG
        O,Rn1A_Cy%t]V=Brv7h<L@)<XGh#XroV6xQg$VA8K
Original-Lines: 52
User-Agent: Gnus/5.090006 (Oort Gnus v0.06) XEmacs/21.4 (Common Lisp,
 i686-pc-linux)
Precedence: list
X-Majordomo: 1.94.jlt7
Xref: main.gmane.org gmane.emacs.gnus.general:45780
X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:45780

[ Please Cc the responses to me as I'm not on the list. ]

A bug in the forwarding code has just bit me.

I set `message-forward-show-mml' to nil because I prefer to forward
mails as they are.  Recently something broke, though.  If you set
`message-forward-show-mml' to nil and try to forward a message encoded
as base64 (e.g. one that contains only a picture), the
Content-Transfer-Encoding header gets stripped from the embedded
message.  You end up with a buffer that looks like this:

[#part type=message/rfc822 raw=t bla bla ...]
X-From-Line: ...
<correct MIME headers sans Content-Transfer-Encoding>

<... base64 body ...>
[#/part]

Obviously, stripping Content-Transfer-Encoding is wrong.  The
resulting message is corrupted because its body will be interpreted to
contain 7bit data.  It is also wrong in principle -- when
`message-forward-show-mml' is unset, I expect little or no tinkering
with the embedded message.  Gnus should just make sure it is correctly
embedded as a part, and the rest will follow from that.

The one place where Content-Transfer-Encoding is removed is in
message-forward-make-body.  I tried the obvious fix of removing
Content-Transfer-Encoding from message-forward-ignored-headers and
having message-forward-make-body manually remove
Content-Transfer-Encoding when message-forward-show-mml is t:

    --- message.el.orig	Tue Jul 23 15:30:29 2002
    +++ message.el	Tue Jul 23 15:32:22 2002
    @@ -336,3 +336,3 @@

    -(defcustom message-forward-ignored-headers "^Content-Transfer-Encoding:\\|^X-Gnus"
    +(defcustom message-forward-ignored-headers "^X-Gnus"
       "*All headers that match this regexp will be deleted when forwarding a message."
    @@ -5045,3 +5045,5 @@
                                (or (search-forward "\n\n" nil t) (point)))
    -	  (message-remove-header message-forward-ignored-headers t)))))
    +	  (message-remove-header message-forward-ignored-headers t)
    +	  (when message-forward-show-mml
    +	    (message-remove-header "^Content-Transfer-Encoding"))))))
       (message-position-point))

But even with this fix, something is *still* removing the
Content-Transfer-Encoding header.  `message-encode-message-body' and
`message-send-mail-partially' both do it, but I'm not sure how or
whether they get called.

Can someone please help?