content_type

diff --git a/ChangeLog b/ChangeLog
index 276c31b69c07bcda36cd0e50fd020af4b402d78b..ef6bcb21b87dbfd5ab4b682637815c2863e51205 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,9 @@ version 1.0 ()
        * tag delete is available now. It moves the selected bookmarks
                to another one
        * bookmarks without a tag can be selected now
-       *
+       * Fix the text/html content type going that's snapshotted
+               This is not needed. Since we use the charset info
+               to determine utf, we need this information
        
 Tue Jul 14 21:38 EST 2009  Luke Reeve   <luke@neuro-tech.net>
 

diff --git a/TODO b/TODO
index b2f5bb0cc594dc27e9811300207ff388bfa76eb8..bd6d5d5fa87fe83362778ea45bbe947347f527ce 100755 (executable)
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@ For 1.0
 ==========================================================================
 - Quote marks screw up adding a bookmark
 - Move htaccess management into the configuration page
-- Fix the text/html content type going that's snapshotted
 
 
 Everything else

diff --git a/htaccess b/htaccess
index 334569c52104f75ed709e9073ff8759d2d2c4e21..4eccf00527a3dbf92378554f31f90c897b4cfd9b 100755 (executable)
--- a/htaccess
+++ b/htaccess
@@ -1,14 +1,16 @@
-RewriteEngine On\r
-RewriteBase /yourwebdirectory\r
-RewriteRule ^bookmarks/(.*) insipid.cgi?tag=$1 [QSA]\r
-RewriteRule ^bookmarks insipid.cgi [QSA]\r
-RewriteRule ^feeds/bookmarks/(.*) insipid.cgi?op=rss&tag=$1 [QSA]\r
-RewriteRule ^feeds/bookmarks insipid.cgi?op=rss [QSA]\r
-RewriteRule ^snapshot/(.*) insipid.cgi?op=viewsnapshot&md5=$1 [QSA]\r
-\r
-RewriteRule ^feeds/json/tags/(.*) insipid.cgi?op=json_tags&tag=$1 [QSA]\r
-RewriteRule ^feeds/json/tags insipid.cgi?op=json_tags [QSA]\r
-\r
-RewriteRule ^feeds/json/posts/(.*) insipid.cgi?op=json_posts&tag=$1 [QSA]\r
-RewriteRule ^feeds/json/posts insipid.cgi?op=json_posts [QSA]\r
-\r
+Options +FollowSymlinks -Indexes
+
+RewriteEngine On
+RewriteBase /yourwebdirectory
+RewriteRule ^bookmarks/(.*) insipid.cgi?tag=$1 [QSA]
+RewriteRule ^bookmarks insipid.cgi [QSA]
+RewriteRule ^feeds/bookmarks/(.*) insipid.cgi?op=rss&tag=$1 [QSA]
+RewriteRule ^feeds/bookmarks insipid.cgi?op=rss [QSA]
+RewriteRule ^snapshot/(.*) insipid.cgi?op=viewsnapshot&md5=$1 [QSA]
+
+RewriteRule ^feeds/json/tags/(.*) insipid.cgi?op=json_tags&tag=$1 [QSA]
+RewriteRule ^feeds/json/tags insipid.cgi?op=json_tags [QSA]
+
+RewriteRule ^feeds/json/posts/(.*) insipid.cgi?op=json_posts&tag=$1 [QSA]
+RewriteRule ^feeds/json/posts insipid.cgi?op=json_posts [QSA]
+

diff --git a/lib/Insipid/Snapshots.pm b/lib/Insipid/Snapshots.pm
index 74dd92fbb5d292fb97976f2bd3ee7f1ecde7a9e6..e6f15365fe5f6ca1feec911aabba0b0c80ce8f6a 100755 (executable)
--- a/lib/Insipid/Snapshots.pm
+++ b/lib/Insipid/Snapshots.pm
@@ -134,7 +134,7 @@ sub fetch_url {
                my $sth = $dbh->prepare($sql);
                my $ct = $res->header('Content-Type');
                if(length($ct) > 50) { $ct = substr($ct, 0, 50); }
-
+               
                $sth->bind_param(1, $md5);
                $sth->bind_param(2, $url);
                $sth->bind_param(3, $ct);