diff -r 1fdbf4170ef4 -r b8bf95b39952 src/server/objecttype.c
--- a/src/server/objecttype.c	Sun Jan 08 15:46:47 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2011 Olaf Wintermann. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "objecttype.h"
-#include "pblock.h"
-
-#include "sstring.h"
-
-int object_type_by_extension(pblock *pb, Session *sn, Request *rq) {
-    sstr_t ppath = sstr(pblock_findkeyval(pb_key_ppath, rq->vars));
-    sstr_t ct;
-    if(ppath.ptr[ppath.length - 1] == '/') {
-        /* directory */
-        ct = sstrn("internal/directory", 18);
-    } else {
-        sstr_t ext;
-        ext.length = 0;
-        for(int i=ppath.length - 1;i>=0;i--) {
-            if(ppath.ptr[i] == '.') {
-                ext.ptr = ppath.ptr + i + 1;
-                ext.length = ppath.length - i - 1;
-            }
-        }
-
-        if(ext.length == 0) {
-            /* no extension, no type */
-            return REQ_NOACTION;
-        }
-
-        /* TODO: we need a map for extensions/types */
-        if(!sstrcmp(ext, sstrn("txt", 3))) {
-            ct = sstr("text/plain");
-        } else if(!sstrcmp(ext, sstrn("htm", 3))) {
-            ct = sstr("text/html");
-        } else if(!sstrcmp(ext, sstrn("html", 4))) {
-            ct = sstr("text/html");
-        } else if(!sstrcmp(ext, sstrn("xml", 3))) {
-            ct = sstr("text/xml");
-        }
-    }
-
-    pblock_kvinsert(pb_key_content_type, ct.ptr, ct.length, rq->srvhdrs);
-    return REQ_PROCEED;
-}