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

[fe...@apache.org]

Author: felicity
Date: Sat Jun 25 14:34:37 2005
New Revision: 201788

URL: http://svn.apache.org/viewcvs?rev=201788&view=rev
Log:
uri_to_domain() skips encoded chars in the host area, but shouldn't if the encoded char should stay encoded

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=201788&r1=201787&r2=201788&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Sat Jun 25 14:34:37 2005
@@ -907,8 +907,9 @@
 
   $uri =~ s,:\d*$,,gs;			# port, bug 4191: sometimes the # is missing
 
-  return if $uri =~ /\%/;         # skip undecoded URIs.
-  # we'll see the decoded version as well
+  # skip undecoded URIs if the encoded bits shouldn't be.
+  # we'll see the decoded version as well.  see url_encode()
+  return if $uri =~ /\%(?:2[1-9a-fA-F]|[3-6][0-9a-fA-f]|7[0-9a-eA-E])/;
 
   # keep IPs intact
   if ($uri !~ /^\d+\.\d+\.\d+\.\d+$/) {