Skip to content

Commit 75f7856

Browse files
author
Richard Jones
committed
Changed message-id format to "<%s.%s.%s%s@%s>" so it complies with RFC822
1 parent 0ced84c commit 75f7856

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

CHANGES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ are given with the most recent entry first.
44
2002-01-?? - 0.4.0b2
55
Fixed:
66
. #495392 ] empty nosy -patch
7-
7+
. #500574 ] messageid must have format <part1@part2>
88

99
2002-01-08 - 0.4.0b1
1010
Feature:

roundup/cgi_client.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: cgi_client.py,v 1.91 2002-01-08 04:03:47 richard Exp $
18+
# $Id: cgi_client.py,v 1.92 2002-01-08 04:12:05 richard Exp $
1919

2020
__doc__ = """
2121
WWW request handler (also used in the stand-alone server).
@@ -470,7 +470,7 @@ def _handle_message(self):
470470

471471
# handle the messageid
472472
# TODO: handle inreplyto
473-
messageid = "%s.%s.%s-%s"%(time.time(), random.random(),
473+
messageid = "<%s.%s.%s@%s>"%(time.time(), random.random(),
474474
self.classname, self.MAIL_DOMAIN)
475475

476476
# now create the message, attaching the files
@@ -1180,6 +1180,9 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
11801180

11811181
#
11821182
# $Log: not supported by cvs2svn $
1183+
# Revision 1.91 2002/01/08 04:03:47 richard
1184+
# I mucked the intent of the code up.
1185+
#
11831186
# Revision 1.90 2002/01/08 03:56:55 richard
11841187
# Oops, missed this before the beta:
11851188
# . #495392 ] empty nosy -patch

roundup/mailgw.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
7373
an exception, the original message is bounced back to the sender with the
7474
explanatory message given in the exception.
7575
76-
$Id: mailgw.py,v 1.47 2002-01-02 02:32:38 richard Exp $
76+
$Id: mailgw.py,v 1.48 2002-01-08 04:12:05 richard Exp $
7777
'''
7878

7979

@@ -427,7 +427,7 @@ def handle_message(self, message):
427427
inreplyto = message.getheader('in-reply-to') or ''
428428
# generate a messageid if there isn't one
429429
if not messageid:
430-
messageid = "%s.%s.%s%s-%s"%(time.time(), random.random(),
430+
messageid = "<%s.%s.%s%s@%s>"%(time.time(), random.random(),
431431
classname, nodeid, self.MAIL_DOMAIN)
432432

433433
#
@@ -708,6 +708,9 @@ def parseContent(content, blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'),
708708

709709
#
710710
# $Log: not supported by cvs2svn $
711+
# Revision 1.47 2002/01/02 02:32:38 richard
712+
# ANONYMOUS_ACCESS -> ANONYMOUS_REGISTER
713+
#
711714
# Revision 1.46 2002/01/02 02:31:38 richard
712715
# Sorry for the huge checkin message - I was only intending to implement #496356
713716
# but I found a number of places where things had been broken by transactions:

roundup/roundupdb.py

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: roundupdb.py,v 1.36 2002-01-02 02:31:38 richard Exp $
18+
# $Id: roundupdb.py,v 1.37 2002-01-08 04:12:05 richard Exp $
1919

2020
__doc__ = """
2121
Extending hyperdb with types specific to issue-tracking.
@@ -331,7 +331,7 @@ def sendmessage(self, nodeid, msgid, change_note):
331331
if not messageid:
332332
# this is an old message that didn't get a messageid, so
333333
# create one
334-
messageid = "%s.%s.%s%s-%s"%(time.time(), random.random(),
334+
messageid = "<%s.%s.%s%s@%s>"%(time.time(), random.random(),
335335
self.classname, nodeid, self.MAIL_DOMAIN)
336336
messages.set(msgid, messageid=messageid)
337337

@@ -530,6 +530,21 @@ def generateChangeNote(self, nodeid, oldvalues):
530530

531531
#
532532
# $Log: not supported by cvs2svn $
533+
# Revision 1.36 2002/01/02 02:31:38 richard
534+
# Sorry for the huge checkin message - I was only intending to implement #496356
535+
# but I found a number of places where things had been broken by transactions:
536+
# . modified ROUNDUPDBSENDMAILDEBUG to be SENDMAILDEBUG and hold a filename
537+
# for _all_ roundup-generated smtp messages to be sent to.
538+
# . the transaction cache had broken the roundupdb.Class set() reactors
539+
# . newly-created author users in the mailgw weren't being committed to the db
540+
#
541+
# Stuff that made it into CHANGES.txt (ie. the stuff I was actually working
542+
# on when I found that stuff :):
543+
# . #496356 ] Use threading in messages
544+
# . detectors were being registered multiple times
545+
# . added tests for mailgw
546+
# . much better attaching of erroneous messages in the mail gateway
547+
#
533548
# Revision 1.35 2001/12/20 15:43:01 rochecompaan
534549
# Features added:
535550
# . Multilink properties are now displayed as comma separated values in

0 commit comments

Comments
 (0)