From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 4 Sep 2011 10:22:25 +0000 (+0000)
Subject: [backfire] merge r28160
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=a3f55423b4615dee2c5d860dab8d51d9d753a80e

[backfire] merge r28160

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28161 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 7276b2019..ca537a4c1 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=23.1
+PKG_RELEASE:=23.2
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_BUILD_DEPENDS := libcyassl liblua
diff --git a/package/uhttpd/src/uhttpd-file.c b/package/uhttpd/src/uhttpd-file.c
index fda86d726..816a69124 100644
--- a/package/uhttpd/src/uhttpd-file.c
+++ b/package/uhttpd/src/uhttpd-file.c
@@ -1,7 +1,7 @@
 /*
  * uhttpd - Tiny single-threaded httpd - Static file handler
  *
- *   Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ static const char * uh_file_mime_lookup(const char *path)
 
 		while( e >= path )
 		{
-			if( (*e == '.') && !strcasecmp(&e[1], m->extn) )
+			if( (*e == '.' || *e == '/') && !strcasecmp(&e[1], m->extn) )
 				return m->mime;
 
 			e--;