Skip to content

Handle MIME/extension mapping case-insensitively #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sfan5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle MIME/extension mapping case-insensitively #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions darkhttpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,12 +612,13 @@ static void add_mime_mapping(const char *extension, const char *mimetype) {
longest_ext = i;

/* look through list and replace an existing entry if possible */
for (i = 0; i < mime_map_size; i++)
if (strcmp(mime_map[i].extension, extension) == 0) {
for (i = 0; i < mime_map_size; i++) {
if (strcasecmp(mime_map[i].extension, extension) == 0) {
free(mime_map[i].mimetype);
mime_map[i].mimetype = xstrdup(mimetype);
return;
}
}

/* no replacement - add a new entry */
mime_map_size++;
Expand All @@ -631,8 +632,8 @@ static void add_mime_mapping(const char *extension, const char *mimetype) {
* binary-searched.
*/
static int mime_mapping_cmp(const void *a, const void *b) {
return strcmp(((const struct mime_mapping *)a)->extension,
((const struct mime_mapping *)b)->extension);
return strcasecmp(((const struct mime_mapping *)a)->extension,
((const struct mime_mapping *)b)->extension);
}

static void sort_mime_map(void) {
Expand Down Expand Up @@ -777,8 +778,8 @@ static void parse_extension_map_file(const char *filename) {
* bsearch()es mime_map, so make sure it's sorted first.
*/
static int mime_mapping_cmp_str(const void *a, const void *b) {
return strcmp((const char *)a,
((const struct mime_mapping *)b)->extension);
return strcasecmp((const char *)a,
((const struct mime_mapping *)b)->extension);
}

static const char *url_content_type(const char *url) {
Expand All @@ -795,7 +796,7 @@ static const char *url_content_type(const char *url) {
bsearch((url + period + 1), mime_map, mime_map_size,
sizeof(struct mime_mapping), mime_mapping_cmp_str);
if (result != NULL) {
assert(strcmp(url + period + 1, result->extension) == 0);
assert(strcasecmp(url + period + 1, result->extension) == 0);
return result->mimetype;
}
}
Expand Down
2 changes: 1 addition & 1 deletion devel/run-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ runtests() {
echo "test/this-gets-replaced ap2" >> $DIR/mimemap
echo "# this is a comment" >> $DIR/mimemap
printf "test/type3\\tapp3\r\n" >> $DIR/mimemap
echo "test/type2 ap2" >> $DIR/mimemap
echo "test/type2 AP2" >> $DIR/mimemap
./a.out $DIR --port $PORT --addr $ADDR \
--mimetypes $DIR/mimemap \
--default-mimetype test/default \
Expand Down
2 changes: 1 addition & 1 deletion devel/test_mimemap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def setUp(self):
self.datalen = len(self.data)
self.files = [ ("test-file.a1", "test/type1"),
("test-file.ap2", "test/type2"),
("test-file.app3", "test/type3"),
("test-file.APP3", "test/type3"),
("test-file.appp4", "test/default") ]
for fn, _ in self.files:
with open(WWWROOT + "/" + fn, 'wb') as f:
Expand Down