You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spamassassin.apache.org by fe...@apache.org on 2006/07/24 17:51:32 UTC

svn commit: r425095 - /spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm

Author: felicity
Date: Mon Jul 24 08:51:32 2006
New Revision: 425095

URL: http://svn.apache.org/viewvc?rev=425095&view=rev
Log:
bug 5006: canonify obfuscated hostnames in redirection

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=425095&r1=425094&r2=425095&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Mon Jul 24 08:51:32 2006
@@ -1085,7 +1085,7 @@
     }
 
     # deal with wierd hostname parts, remove user/pass, etc.
-    if ($nuri =~ m{^(https?://)([^/]+)(\/.*)?$}i) {
+    if ($nuri =~ m{^(https?://)([^/]+?)((?::\d+)?\/.*)?$}i) {
       my($proto, $host, $rest) = ($1,$2,$3);
 
       # not required