# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1417907170 -7200
# Node ID d13eba8fa8dc5bdeebf50f480dea899b13aef580
# Parent  fe420576f2847240eaa17fb85e402d696f13fbf3# Parent  3e3756b113a1c597898e97510d3d62eb8ed95a32
Merge.

diff -r fe420576f284 -r d13eba8fa8dc urllog.tcl
--- a/urllog.tcl	Sun Dec 07 01:05:30 2014 +0200
+++ b/urllog.tcl	Sun Dec 07 01:06:10 2014 +0200
@@ -466,10 +466,9 @@
   }
 
   ### Do we perform additional optional checks?
-  if {$urllog_check != 0 && (($http_tls_support != 0 && $u_proto == "https") || $u_proto == "http")} {
-    # Ok
-  } else {
-    # No optional checks, just add the URL, if it does not exist already
+  if {$urllog_check == 0 || !(($http_tls_support != 0 && $u_proto == "https") || $u_proto == "http")} {
+    # No optional checks, or it's not http/https.
+    # Just add the URL, if it does not exist already.
     urllog_addurl $urlStr $urlNick $urlHost $urlChan ""
     return 1
   }
@@ -604,7 +603,7 @@
   }
 
   ### Check the channel
-  foreach akey [split $urllog_log_channels] {
+  foreach akey [split $urllog_log_channels ";"] {
     if {[string match $akey $uchan]} {
       ### Do the URL checking
       foreach str [split $utext " "] {