From a6c02f8912c17c8c74b5435bdaa8691fff92494c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 4 Sep 2011 10:21:05 +0000 Subject: [PATCH] uhttpd: properly match mimetype entries which cover the whole filename (#8236) SVN-Revision: 28160 --- package/uhttpd/Makefile | 2 +- package/uhttpd/src/uhttpd-file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile index 93ac8cf03e..5fa12fc8bc 100644 --- a/package/uhttpd/Makefile +++ b/package/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=25 +PKG_RELEASE:=26 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_CONFIG_DEPENDS := \ diff --git a/package/uhttpd/src/uhttpd-file.c b/package/uhttpd/src/uhttpd-file.c index fda86d7263..816a69124e 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 + * Copyright (C) 2010-2011 Jo-Philipp Wich * * 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--; -- 2.25.1