Changeset 36777

Timestamp:

02/17/10 02:55:17 (3 years ago)

Author:

drry

Message:

HTML5 READY!!!

Files:

• lang/perl/tiarra/trunk/module/Auto/FetchTitle.pm (modified) (2 diffs)

lang/perl/tiarra/trunk/module/Auto/FetchTitle.pm

@@ -1600 +1600 @@
   }
 
-  if( my $loc = $headers->{Location} )
+  if( my $loc = $headers->{'Location'} )
   {
     $DEBUG and $this->_debug($full_ch_name, "debug: has Location header: $loc");
@@ -1663 +1663 @@
   if( $enc eq 'auto' && $content2 =~ m{
                                        <meta(?:\s[^>]*?)?\s
-                                       (?:http-equiv\s*=\s*(["'])Content-Type\1(?:\s[^>]*?)?\scontent\s*=\s*(["'])\w+/\w+(?:\+\w+)*\s*;\s*charset=([-\w]+)\2|
-                                          content\s*=\s*(["'])\w+/\w+(?:\+\w+)*\s*;\s*charset=([-\w]+)\4(?:\s[^>]+?)?\shttp-equiv\s*=\s*(["'])Content-Type\6)
+                                       (?:http-equiv\s*=\s*(["']?)Content-Type\1(?:\s[^>]*?)?\scontent\s*=\s*(["']?)\w+/\w+(?:\+\w+)*\s*;\s*charset=([-\w]+)\2|
+                                          content\s*=\s*(["']?)\w+/\w+(?:\+\w+)*\s*;\s*charset=([-\w]+)\4(?:\s[^>]+?)?\shttp-equiv\s*=\s*(["']?)Content-Type\6|
+                                          charset\s*=\s*(["']?)([-\w])+\7)
                                        (?:\s[^>]*|/)?>
                                      }ix )
   {
-    my $e = lc($3 || $5);
+    my $e = lc($3 || $5 || $8);
     $enc = $e =~ /s\w*jis/     ? 'sjis'
          : $e =~ /euc/         ? 'euc'