[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1872398 - in /subversion/trunk/tools/hook-scripts/mailer: mailer.conf.example mailer.py

From: Yasuhito FUTATSUKI <futatuki_at_poem.co.jp>
Date: Tue, 7 Jan 2020 10:10:34 +0900

On 2020/01/07 9:40, Daniel Shahaf wrote:
> futatuki_at_apache.org wrote on Mon, Jan 06, 2020 at 23:34:17 -0000:
>> +++ subversion/trunk/tools/hook-scripts/mailer/mailer.conf.example Mon Jan 6 23:34:17 2020
>> @@ -23,6 +23,10 @@
>> # This option specifies the hostname for delivery via SMTP.
>> #smtp_hostname = localhost
>>
>> +# This option specifies the TCP port number to connect for SMTP.
>> +# If it is not specified, 25 is used by default.
>> +#smtp_port = 25
>> +
>> +++ subversion/trunk/tools/hook-scripts/mailer/mailer.py Mon Jan 6 23:34:17 2020
>> @@ -299,11 +299,15 @@ class SMTPOutput(MailedOutput):
>> (to minimize the chances of said lockout).
>> """
>>
>> + if self.cfg.is_set('general.smtp_port'):
>> + smtp_port = self.cfg.general.smtp_port
>> + else:
>> + smtp_port = smtplib.SMTP_PORT
>> try:
>> if self.cfg.is_set('general.smtp_ssl') and self.cfg.general.smtp_ssl == 'yes':
>> - server = smtplib.SMTP_SSL(self.cfg.general.smtp_hostname)
>> + server = smtplib.SMTP_SSL(self.cfg.general.smtp_hostname, smtp_port)
>
> This seems to be a breaking change. The old code, «smtplib.SMTP_SSL(foo)»,
> used port 465; the new code, «smtplib.SMTP_SSL(foo, smtplib.SMTP_PORT)», will
> try to connect to port 25 using SMTP-over-SSL until the administrator sets
> smtp_port=465 in the config file.

Thank you for the report. I've fixed it in r1872403.

Cheers,

-- 
Yasuhito FUTATSUKI <futatuki_at_yf.bsdclub.org> / <futatuki_at_poem.co.jp>
Received on 2020-01-07 02:12:45 CET

This is an archived mail posted to the Subversion Dev mailing list.