From 681ccf7171a4427a2d6e6ad954712f41a90057dd Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 21 Feb 2003 05:58:36 +0000 Subject: Reliable and CRLF - a neverending (sad) story --- Echolot/Pinger/CPunk.pm | 19 ++++++++++--------- NEWS | 1 + 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Echolot/Pinger/CPunk.pm b/Echolot/Pinger/CPunk.pm index 3878cff..03fad41 100644 --- a/Echolot/Pinger/CPunk.pm +++ b/Echolot/Pinger/CPunk.pm @@ -1,7 +1,7 @@ package Echolot::Pinger::CPunk; # (c) 2002 Peter Palfrader -# $Id: CPunk.pm,v 1.15 2003/02/17 14:44:15 weasel Exp $ +# $Id: CPunk.pm,v 1.16 2003/02/21 05:58:36 weasel Exp $ # =pod @@ -79,7 +79,7 @@ sub encrypt_to($$$$) { - $msg =~ s/\r?\n/\r\n/g; + #$msg =~ s/\r?\n/\r\n/g; @@ -172,6 +172,7 @@ sub encrypt_to($$$$) { return undef); $result =~ s,^Version: .*$,Version: N/A,m; + $result =~ s/\r?\n/\r\n/g; return $result; }; @@ -185,12 +186,12 @@ sub ping($$$$$) { if ($with_from) { my $address = Echolot::Config::get()->{'my_localpart'} . '@' . Echolot::Config::get()->{'my_domain'}; - $header = "##\nFrom: Echolot Pinger <$address>\n\n"; + $header = "##\r\nFrom: Echolot Pinger <$address>\r\n\r\n"; $with_from = 0; }; - $msg = "::\n". - "Anon-To: $to\n". - "\n". + $msg = "::\r\n". + "Anon-To: $to\r\n". + "\r\n". $header. $msg; @@ -199,9 +200,9 @@ sub ping($$$$$) { (defined $encrypted) or Echolot::Log::debug("Encrypted is undefined."), return undef; - $msg = "::\n". - "Encrypted: PGP\n". - "\n". + $msg = "::\r\n". + "Encrypted: PGP\r\n". + "\r\n". $encrypted; }; $to = $hop->{'address'}; diff --git a/NEWS b/NEWS index 2de218d..c65c6a7 100644 --- a/NEWS +++ b/NEWS @@ -27,6 +27,7 @@ Changes in version * Compile a list of default From: lines as well as a list of remailers which allow user supplied From headers. * Print status summary to log daily. + * Reliable and CRLF - a neverending (sad) story. Changes in version 2.0.10 - 2003-02-03 * Return undef rather than 0 if we cannot open a Maildir. -- cgit v1.2.3