[svn:qpsmtpd] r911 - trunk/plugins

[robert]

Author: robert
Date: Fri May 16 20:55:18 2008
New Revision: 911

Modified:
   trunk/plugins/uribl

Log:
Hostnames come in lowercase and longer than 8 characters too.


Modified: trunk/plugins/uribl
==============================================================================
--- trunk/plugins/uribl (original)
+++ trunk/plugins/uribl Fri May 16 20:55:18 2008
@@ -323,11 +323,11 @@
             }
         }
         while ($l =~ m{
-            ([Ww]{3,3}\.[\w\-.]+\.[a-zA-Z]{2,8}|    # www.hostname
+            ([Ww]{3,3}\.[\w\-.]+\.[a-zA-Z]{2,32}|    # www.hostname
              [a-zA-Z0-9][a-zA-Z0-9\-.]+\.           # hostname.   ...
                (?:com|net|org|biz|info|[a-zA-Z]{2,2}))(?!\w)  # (cc)TLD
-            }gx) {
-            my $host = $1;
+            }gix) {
+            my $host = lc $1;
             my @host_domains = split /\./, $host;
             $self->log(LOGDEBUG, "uribl: matched 'www.' hostname $host");
 
@@ -352,9 +352,9 @@
         while ($l =~ m{
             \w{3,16}:/+                 # protocol
             (?:\S+@)?                   # user/pass
-            ([\w\-.]+\.[a-zA-Z]{2,8})   # hostname
+            ([\w\-.]+\.[a-zA-Z]{2,32})   # hostname
             }gx) {
-            my $host = $1;
+            my $host = lc $1;
             my @host_domains = split /\./, $host;
             $self->log(LOGDEBUG, "uribl: matched full URI hostname $host");