diff src/scanner.cpp @ 270:f92f24950bd3 stable-6-0-35

Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
author Carl Byington <carl@five-ten-sg.com>
date Mon, 09 Sep 2013 15:15:53 -0700
parents ef97c7cd4a6e
children a99b6c1f5f67
line wrap: on
line diff
--- a/src/scanner.cpp	Wed May 22 11:34:37 2013 -0700
+++ b/src/scanner.cpp	Mon Sep 09 15:15:53 2013 -0700
@@ -1189,11 +1189,12 @@
 ////////////////////////////////////////////////
 //
 //
-recorder::recorder(mlfiPriv *priv_, string_set &html_tags_, string_set &tlds_, string_set &cctlds_) {
+recorder::recorder(mlfiPriv *priv_, string_set &html_tags_, string_set &tlds_, string_set &tldwilds_, string_set &tldnots_) {
     priv          = priv_;
     html_tags     = &html_tags_;
     tlds          = &tlds_;
-    cctlds        = &cctlds_;
+    tldwilds      = &tldwilds_;
+    tldnots       = &tldnots_;
     bad_html_tags = 0;
     binary_tags   = 0;
 }
@@ -1268,6 +1269,10 @@
                 // is last component a tld?
                 string_set::iterator i = memory->get_tlds()->find(p2+1);
                 if (i != memory->get_tlds()->end()) memory->new_url((char*)pending);
+                else {
+                    i = memory->get_tldwilds()->find(p2+1);
+                    if (i != memory->get_tldwilds()->end()) memory->new_url((char*)pending);
+                }
             }
         }
     }