Update of /cvsroot/mailman/mailman/Mailman
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3048
Modified Files:
Tag: Release_2_1-maint
Utils.py
Log Message:
Improved fix for bug 1275856 to return host part of DEFAULT_URL if any from
get_domain() if VIRTUAL_HOST_OVERVIEW off.
Index: Utils.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Utils.py,v
retrieving revision 2.45.2.16
retrieving revision 2.45.2.17
diff -u -d -r2.45.2.16 -r2.45.2.17
--- Utils.py 12 Mar 2006 17:56:29 -0000 2.45.2.16
+++ Utils.py 18 Mar 2006 17:23:04 -0000 2.45.2.17
@@ -680,13 +680,11 @@
if mm_cfg.VIRTUAL_HOST_OVERVIEW and host:
return host.lower()
else:
- # See the note in Defaults.py concerning DEFAULT_HOST_NAME
- # vs. DEFAULT_EMAIL_HOST.
- # MAS: This is inconsistent - DEFAULT_URL_HOST is correct.
- # DEFAULT_HOST_NAME should really be the host portion of
- # DEFAULT_URL, but that's not a setting, and these have been
- # deprecated since Aug., 2001, so leave it.
- hostname = mm_cfg.DEFAULT_HOST_NAME or mm_cfg.DEFAULT_URL_HOST
+ # See the note in Defaults.py concerning DEFAULT_URL
+ # vs. DEFAULT_URL_HOST.
+ hostname = ((mm_cfg.DEFAULT_URL
+ and urlparse.urlparse(mm_cfg.DEFAULT_URL)[1])
+ or mm_cfg.DEFAULT_URL_HOST)
return hostname.lower()
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
