X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=mimetypes.h;h=06514861975d1ac14f744473f3b709310c31aa60;hp=7fd885c5728f5cd8e805ee2b5643275b8ce64923;hb=fd8e5e379c23c5fbcec3e76894b839233df09067;hpb=6f3d40217ecdd59fd8bc041712d7224082525ca1

diff --git a/mimetypes.h b/mimetypes.h
index 7fd885c..0651486 100644
--- a/mimetypes.h
+++ b/mimetypes.h
@@ -1,19 +1,20 @@
 /*
- * uhttpd - Tiny single-threaded httpd - MIME type definitions
+ * uhttpd - Tiny single-threaded httpd
  *
- *   Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #ifndef _UHTTPD_MIMETYPES_
@@ -23,7 +24,7 @@ struct mimetype {
 	const char *mime;
 };
 
-static struct mimetype uh_mime_types[] = {
+static const struct mimetype uh_mime_types[] = {
 
 	{ "txt",     "text/plain" },
 	{ "log",     "text/plain" },
@@ -45,6 +46,8 @@ static struct mimetype uh_mime_types[] = {
 	{ "jpeg",    "image/jpeg" },
 	{ "svg",     "image/svg+xml" },
 
+	{ "json",    "application/json" },
+	{ "jsonp",   "application/javascript" },
 	{ "zip",     "application/zip" },
 	{ "pdf",     "application/pdf" },
 	{ "xml",     "application/xml" },