Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@3154 5dc97367-9…

…7f1-0310-9951-d761b3857238
  • Loading branch information...
commit c8e01320c547e0695897b1e11a6fc86b33413168 1 parent 9f3933e
@alobbs alobbs authored
Showing with 4 additions and 38 deletions.
  1. +3 −0  ChangeLog
  2. +1 −38 cherokee.conf.sample.pre
View
3  ChangeLog
@@ -1,5 +1,8 @@
2009-04-21 Alvaro Lopez Ortega <alvaro@octality.com>
+ * cherokee.conf.sample.pre: Adds a mime-type for JSON, and remove
+ a few others.
+
* cherokee/thread.c, cherokee/thread.h: Do not call pthread_wait
twice (it crashes).
View
39 cherokee.conf.sample.pre
@@ -109,9 +109,8 @@ mime!application/hta!extensions = hta
mime!application/java-archive!extensions = jar
mime!application/java-serialized-object!extensions = ser
mime!application/java-vm!extensions = class
+mime!application/json!extensions = json
mime!application/mac-binhex40!extensions = hqx
-mime!application/mac-compactpro!extensions = cpt
-mime!application/mathematica!extensions = nb
mime!application/msaccess!extensions = mdb
mime!application/msword!extensions = doc,dot
mime!application/octet-stream!extensions = bin
@@ -144,25 +143,6 @@ mime!application/vnd.oasis.opendocument.text!extensions = odt
mime!application/vnd.oasis.opendocument.text-master!extensions = odm
mime!application/vnd.oasis.opendocument.text-web!extensions = oth
mime!application/vnd.pkg5.info!extensions = p5i
-mime!application/vnd.rim.cod!extensions = cod
-mime!application/vnd.smaf!extensions = mmf
-mime!application/vnd.stardivision.calc!extensions = sdc
-mime!application/vnd.stardivision.draw!extensions = sda
-mime!application/vnd.stardivision.impress!extensions = sdd,sdp
-mime!application/vnd.stardivision.math!extensions = smf
-mime!application/vnd.stardivision.writer!extensions = sdw,vor
-mime!application/vnd.stardivision.writer-global!extensions = sgl
-mime!application/vnd.sun.xml.calc!extensions = sxc
-mime!application/vnd.sun.xml.calc.template!extensions = stc
-mime!application/vnd.sun.xml.draw!extensions = sxd
-mime!application/vnd.sun.xml.draw.template!extensions = std
-mime!application/vnd.sun.xml.impress!extensions = sxi
-mime!application/vnd.sun.xml.impress.template!extensions = sti
-mime!application/vnd.sun.xml.math!extensions = sxm
-mime!application/vnd.sun.xml.writer!extensions = sxw
-mime!application/vnd.sun.xml.writer.global!extensions = sxg
-mime!application/vnd.sun.xml.writer.template!extensions = stw
-mime!application/vnd.symbian.install!extensions = sis
mime!application/vnd.visio!extensions = vsd
mime!application/vnd.wap.wbxml!extensions = wbxml
mime!application/vnd.wap.wmlc!extensions = wmlc
@@ -172,36 +152,27 @@ mime!application/x-apple-diskimage!extensions = dmg
mime!application/x-bcpio!extensions = bcpio
mime!application/x-bittorrent!extensions = torrent
mime!application/x-cdf!extensions = cdf
-mime!application/x-cdlink!extensions = vcd
-mime!application/x-chess-pgn!extensions = pgn
mime!application/x-cpio!extensions = cpio
mime!application/x-csh!extensions = csh
mime!application/x-debian-package!extensions = deb,udeb
mime!application/x-director!extensions = dcr,dir,dxr
-mime!application/x-dms!extensions = dms
-mime!application/x-doom!extensions = wad
mime!application/x-dvi!extensions = dvi
mime!application/x-flac!extensions = flac
mime!application/x-font!extensions = pfa,pfb,gsf,pcf,pcf.Z
mime!application/x-freemind!extensions = mm
mime!application/x-gnumeric!extensions = gnumeric
-mime!application/x-go-sgf!extensions = sgf
-mime!application/x-graphing-calculator!extensions = gcf
mime!application/x-gtar!extensions = gtar,tgz,taz
mime!application/x-gzip!extensions = gz,tgz
-mime!application/x-hdf!extensions = hdf
mime!application/x-httpd-php!extensions = phtml,pht,php
mime!application/x-httpd-php-source!extensions = phps
mime!application/x-httpd-php3!extensions = php3
mime!application/x-httpd-php3-preprocessed!extensions = php3p
mime!application/x-httpd-php4!extensions = php4
-mime!application/x-ica!extensions = ica
mime!application/x-internet-signup!extensions = ins,isp
mime!application/x-iphone!extensions = iii
mime!application/x-iso9660-image!extensions = iso
mime!application/x-java-jnlp-file!extensions = jnlp
mime!application/x-javascript!extensions = js
-mime!application/x-jmol!extensions = jmz
mime!application/x-kchart!extensions = chrt
mime!application/x-killustrator!extensions = kil
mime!application/x-koan!extensions = skp,skd,skt,skm
@@ -212,8 +183,6 @@ mime!application/x-latex!extensions = latex
mime!application/x-lha!extensions = lha
mime!application/x-lzh!extensions = lzh
mime!application/x-lzx!extensions = lzx
-mime!application/x-maker!extensions = frm,maker,frame,fm,fb,book,fbdoc
-mime!application/x-mif!extensions = mif
mime!application/x-ms-wmd!extensions = wmd
mime!application/x-ms-wmz!extensions = wmz
mime!application/x-msdos-program!extensions = com,exe,bat,dll
@@ -237,7 +206,6 @@ mime!application/x-sv4crc!extensions = sv4crc
mime!application/x-tar!extensions = tar
mime!application/x-tar!extensions = tar
mime!application/x-tcl!extensions = tcl
-mime!application/x-tex-gf!extensions = gf
mime!application/x-tex-pk!extensions = pk
mime!application/x-texinfo!extensions = texinfo,texi
mime!application/x-trash!extensions = ~,bak,old,sik
@@ -246,8 +214,6 @@ mime!application/x-troff-man!extensions = man
mime!application/x-troff-me!extensions = me
mime!application/x-troff-ms!extensions = ms
mime!application/x-ustar!extensions = ustar
-mime!application/x-wais-source!extensions = src
-mime!application/x-wingz!extensions = wz
mime!application/x-x509-ca-cert!extensions = crt
mime!application/x-xcf!extensions = xcf
mime!application/x-xfig!extensions = fig
@@ -255,7 +221,6 @@ mime!application/x-xpinstall!extensions = xpi
mime!application/xhtml+xml!extensions = xhtml,xht
mime!application/xml!extensions = xml,xsl
mime!application/zip!extensions = zip
-mime!application/zip!extensions = zip
mime!audio/basic!extensions = au,snd
mime!audio/midi!extensions = mid,midi,kar
mime!audio/mpeg!extensions = mpga,mpega,mp2,mp3,m4a
@@ -271,10 +236,8 @@ mime!audio/x-realaudio!extensions = ra
mime!audio/x-scpls!extensions = pls
mime!audio/x-sd2!extensions = sd2
mime!audio/x-wav!extensions = wav
-mime!chemical/x-alchemy!extensions = alc
mime!chemical/x-cache!extensions = cac,cache
mime!chemical/x-cache-csf!extensions = csf
-mime!chemical/x-cactvs-binary!extensions = cbin,cascii,ctab
mime!chemical/x-cdx!extensions = cdx
mime!chemical/x-cif!extensions = cif
mime!chemical/x-cmdf!extensions = cmdf
Please sign in to comment.
Something went wrong with that request. Please try again.