r13883 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c - netsurf-commits

Thursday, 19 April 2012

Author: mmu_man
Date: Thu Apr 19 09:50:51 2012
New Revision: 13883

URL: http://source.netsurf-browser.org?rev=13883&view=rev
Log:
Cleanup.
Remove call to fetch_filetype() and just let the mime sniffer handle unknown types on its
own. Works well enough and avoids relying on file extensions.

Modified:
    branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c

Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c
URL:
http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support...
==============================================================================

--- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original)
+++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Thu Apr 19 09:50:51 2012
@@ -32,7 +32,7 @@
  * gopher://sdf.org/1/users/	long page
  * gopher://jgw.mdns.org/1/	search items
  * gopher://jgw.mdns.org/1/MISC/	's' item (sound)
- * gopher://gopher.floodgap.com/1/gopher	empty+broken link - fixed 2012/04/08
+ * gopher://gopher.floodgap.com/1/gopher	broken link - fixed 2012/04/08
  * gopher://sdf.org/1/maps/m	missing lines - fixed 2012/04/08
  */
 
@@ -280,11 +280,7 @@
 
 	mime = gopher_type_to_mime(s->type);
 
-	/* TODO: use the newer mime sniffer API,
-	 * fetch_filetype() is wrongly assuming unknown files to be HTML.
-	 */
-	if (mime == NULL)
-		mime = fetch_filetype(nsurl_access(s->url));
+	/* leave other types unknown and let the mime sniffer handle them */
 
 	if (mime) {
 		LOG(("gopher %p mime is '%s'", s, mime));
@@ -298,6 +294,8 @@
 
 		return true;
 	}
+
+	LOG(("gopher %p unknown mime (type '%c')", s, s->type));
 
 	return false;
 }
@@ -433,7 +431,6 @@
 	int error = snprintf(buffer, buffer_length,
 			"<html>\n"
 			"<head>\n"
-			/*"<!-- base href=\"%s\" -->\n"*//* XXX: needs the content
url */
 			"<meta http-equiv=\"Content-Type\" content=\"text/html;
charset=UTF-8\" />\n"
 			"<link rel=\"stylesheet\" title=\"Standard\" "
 				"type=\"text/css\"
href=\"resource:internal.css\">\n"



    

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

r13883 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c