changeset 318:5d886e2137d5

urllog: Fix character set conversion a bit.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 21 Apr 2015 21:57:30 +0300
parents 994c398cb3fc
children 0abb738a2b1f
files urllog.tcl
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/urllog.tcl	Fri Mar 13 16:17:40 2015 +0200
+++ b/urllog.tcl	Tue Apr 21 21:57:30 2015 +0300
@@ -460,13 +460,9 @@
     # Check if the document has specified encoding
     # KLUDGE!
     set uencoding $uenc_http2
-    if {$uenc_doc != ""} {
-      # Does it differ from what HTTP says?
-      if {$uenc_http != "" && $uenc_doc != $uenc_http && $uenc_doc2 != $uenc_http2} {
-        # Yes, we will try reconverting
-        set uencoding $uenc_doc2
-      }
-    } elseif {$uenc_http == ""} {
+    if {$uencoding == "" && $uenc_doc2 != ""} {
+      set uencoding $uenc_doc2
+    } elseif {$uencoding == ""} {
       # If _NO_ known encoding of any kind, assume the default of iso8859-1    
       set uencoding "iso8859-1"
     }