From 20ef055c2f698618142a280d5cbc010acacfd651 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 15 Apr 2010 19:46:35 +0000
Subject: uhttpd: - make network timeout configurable, increase default to 30
 seconds (#7067) - follow symlinks in docroot and add option to disable that -
 fix mimetype detection for files with combined extensions (.tar.gz, ...)

SVN-Revision: 20883
---
 package/uhttpd/src/uhttpd-file.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'package/uhttpd/src/uhttpd-file.c')

diff --git a/package/uhttpd/src/uhttpd-file.c b/package/uhttpd/src/uhttpd-file.c
index 2a06f85..81f66a3 100644
--- a/package/uhttpd/src/uhttpd-file.c
+++ b/package/uhttpd/src/uhttpd-file.c
@@ -29,23 +29,21 @@
 static const char * uh_file_mime_lookup(const char *path)
 {
 	struct mimetype *m = &uh_mime_types[0];
-	char *p, *pd, *ps;
+	char *e;
 
-	ps = strrchr(path, '/');
-	pd = strrchr(path, '.');
-
-	/* use either slash or dot as separator, whatever comes last */
-	p = (ps && pd && (ps > pd)) ? ps : pd;
-
-	if( (p != NULL) && (*(++p) != 0) )
+	while( m->extn )
 	{
-		while( m->extn )
+		e = &path[strlen(path)-1];
+
+		while( e >= path )
 		{
-			if( ! strcasecmp(p, m->extn) )
+			if( (*e == '.') && !strcasecmp(&e[1], m->extn) )
 				return m->mime;
 
-			m++;
+			e--;
 		}
+
+		m++;
 	}
 
 	return "application/octet-stream";
-- 
cgit v1.1