Permalink
Browse files

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

…7f1-0310-9951-d761b3857238
  • Loading branch information...
1 parent 0caba36 commit be1b01e54913d056c86660e67358c2f41cbe0473 @alobbs alobbs committed Mar 23, 2008
Showing with 280 additions and 804 deletions.
  1. +7 −0 ChangeLog
  2. +1 −24 Makefile.am
  3. +272 −1 cherokee.conf.sample.pre
  4. +0 −15 mime.compression.types.sample
  5. +0 −764 mime.types.sample
View
@@ -1,5 +1,12 @@
2008-03-23 Alvaro Lopez Ortega <alvaro@alobbs.com>
+ * Makefile.am, mime.types.sample, mime.compression.types.sample:
+ Example mime type files have been removed. They are no longer
+ needed.
+
+ * cherokee.conf.sample.pre: Added a bunch of mime types. Most of
+ the old mimes have been converted.
+
* cherokee/mime.c, cherokee/server.c (configure_server): The mime
class has been reworked. Mime types are not longer read from a
text file; from now on, the general configuration system is used
View
@@ -40,10 +40,6 @@ CONFS_PRE = \
cherokee.conf.sample.pre \
performance.conf.sample.pre
-CONFS_DONE = \
-mime.types.sample \
-mime.compression.types.sample
-
CONFS = \
$(CONFS_PRE:.sample.pre=.sample)
@@ -71,7 +67,6 @@ SUNWcherokee.spec \
pam.d_cherokee \
cherokee.pc.in \
$(m4data_DATA) \
-$(CONFS_DONE) \
$(CONFS_PRE) \
$(CONSTANTS_PRE) \
$(man_MANS) \
@@ -90,7 +85,7 @@ uninstall-local-config:
$(RM) -f $(DESTDIR)$(pkgincludedir)/cherokee-config.h; \
fi
-install-data-local: $(CONFS) $(CONFS_DONE) install-data-local-config
+install-data-local: $(CONFS) install-data-local-config
@$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)
@$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/ssl
@$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/mods-available
@@ -109,16 +104,6 @@ install-data-local: $(CONFS) $(CONFS_DONE) install-data-local-config
else \
$(INSTALL_DATA) $(top_builddir)/performance.conf.sample $(DESTDIR)$(cherokeeconfdir)/cherokee.conf.perf_sample; \
fi
- @if test -f $(DESTDIR)$(cherokeeconfdir)/mime.types ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mime.types"; \
- else \
- $(INSTALL_DATA) $(top_srcdir)/mime.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.types; \
- fi
- @if test -f $(DESTDIR)$(cherokeeconfdir)/mime.compression.types ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mime.compression.types"; \
- else \
- $(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \
- fi
@if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \
$(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \
fi
@@ -133,14 +118,6 @@ uninstall-local: uninstall-local-config
echo "rm -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf.perf_sample"; \
$(RM) -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf.perf_sample; \
fi
- @if test -f $(DESTDIR)$(cherokeeconfdir)/mime.types ; then \
- echo "rm -f $(cherokeeconfdir)/mime.types"; \
- $(RM) -f $(DESTDIR)$(cherokeeconfdir)/mime.types; \
- fi
- @if test -f $(DESTDIR)$(cherokeeconfdir)/mime.compression.types ; then \
- echo "rm -f $(cherokeeconfdir)/mime.compression.types"; \
- $(RM) -f $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \
- fi
test:
$(MAKE) -C qa test
View
@@ -89,4 +89,275 @@ icons!suffix!control_play.png = bin,exe,com,msi,out
icons!suffix!email.png = eml,mbox,box,email,mbx
icons!suffix!printer.png = ps,eps
-
+# Mime types
+#
+mime!application/bzip2!extensions = bz2
+mime!application/gzip!extensions = gz
+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/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
+mime!application/octetstream!extensions = 7z
+mime!application/octetstream!extensions = ace
+mime!application/oda!extensions = oda
+mime!application/ogg!extensions = ogg
+mime!application/pdf!extensions = pdf
+mime!application/pgp-keys!extensions = key
+mime!application/pgp-signature!extensions = pgp
+mime!application/pics-rules!extensions = prf
+mime!application/postscript!extensions = ps,ai,eps
+mime!application/rar!extensions = rar
+mime!application/rar!extensions = rar
+mime!application/rdf+xml!extensions = rdf
+mime!application/rss+xml!extensions = rss
+mime!application/smil!extensions = smi,smil
+mime!application/vnd.mozilla.xul+xml!extensions = xul
+mime!application/vnd.ms-excel!extensions = xls,xlb,xlt
+mime!application/vnd.ms-pki.seccat!extensions = cat
+mime!application/vnd.ms-pki.stl!extensions = stl
+mime!application/vnd.ms-powerpoint!extensions = ppt,pps
+mime!application/vnd.oasis.opendocument.chart!extensions = odc
+mime!application/vnd.oasis.opendocument.database!extensions = odb
+mime!application/vnd.oasis.opendocument.formula!extensions = odf
+mime!application/vnd.oasis.opendocument.graphics!extensions = odg
+mime!application/vnd.oasis.opendocument.image!extensions = odi
+mime!application/vnd.oasis.opendocument.presentation!extensions = odp
+mime!application/vnd.oasis.opendocument.spreadsheet!extensions = ods
+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.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
+mime!application/vnd.wap.wmlscriptc!extensions = wmlsc
+mime!application/x-abiword!extensions = abw
+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
+mime!application/x-kpresenter!extensions = kpr,kpt
+mime!application/x-kspread!extensions = ksp
+mime!application/x-kword!extensions = kwd,kwt
+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
+mime!application/x-msi!extensions = msi
+mime!application/x-netcdf!extensions = nc
+mime!application/x-ns-proxy-autoconfig!extensions = pac
+mime!application/x-nwc!extensions = nwc
+mime!application/x-object!extensions = o
+mime!application/x-oz-application!extensions = oza
+mime!application/x-pkcs7-certreqresp!extensions = p7r
+mime!application/x-pkcs7-crl!extensions = crl
+mime!application/x-python-code!extensions = pyc,pyo
+mime!application/x-quicktimeplayer!extensions = qtl
+mime!application/x-redhat-package-manager!extensions = rpm
+mime!application/x-sh!extensions = sh
+mime!application/x-shar!extensions = shar
+mime!application/x-shockwave-flash!extensions = swf,swfl
+mime!application/x-stuffit!extensions = sit
+mime!application/x-stuffit!extensions = sit,sea
+mime!application/x-sv4cpio!extensions = sv4cpio
+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
+mime!application/x-troff!extensions = t,tr,roff
+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
+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
+mime!audio/mpegurl!extensions = m3u
+mime!audio/prs.sid!extensions = sid
+mime!audio/x-aiff!extensions = aif,aiff,aifc
+mime!audio/x-gsm!extensions = gsm
+mime!audio/x-mpegurl!extensions = m3u
+mime!audio/x-ms-wax!extensions = wax
+mime!audio/x-ms-wma!extensions = wma
+mime!audio/x-pn-realaudio!extensions = ra,rm,ram
+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
+mime!chemical/x-cml!extensions = cml
+mime!chemical/x-compass!extensions = cpa
+mime!chemical/x-crossfire!extensions = bsd
+mime!chemical/x-csml!extensions = csml,csm
+mime!chemical/x-ctx!extensions = ctx
+mime!chemical/x-cxf!extensions = cxf,cef
+mime!chemical/x-isostar!extensions = istr,ist
+mime!chemical/x-jcamp-dx!extensions = jdx,dx
+mime!chemical/x-kinemage!extensions = kin
+mime!chemical/x-pdb!extensions = pdb,ent
+mime!chemical/x-swissprot!extensions = sw
+mime!chemical/x-vamas-iso14976!extensions = vms
+mime!chemical/x-vmd!extensions = vmd
+mime!chemical/x-xtel!extensions = xtel
+mime!chemical/x-xyz!extensions = xyz
+mime!image/gif!extensions = gif
+mime!image/ief!extensions = ief
+mime!image/jpeg!extensions = jpeg,jpg,jpe
+mime!image/pcx!extensions = pcx
+mime!image/png!extensions = png
+mime!image/svg+xml!extensions = svg,svgz
+mime!image/tiff!extensions = tiff,tif
+mime!image/vnd.djvu!extensions = djvu,djv
+mime!image/vnd.wap.wbmp!extensions = wbmp
+mime!image/x-icon!extensions = ico
+mime!image/x-ms-bmp!extensions = bmp
+mime!image/x-photoshop!extensions = psd
+mime!image/x-portable-anymap!extensions = pnm
+mime!image/x-portable-bitmap!extensions = pbm
+mime!image/x-portable-graymap!extensions = pgm
+mime!image/x-portable-pixmap!extensions = ppm
+mime!image/x-rgb!extensions = rgb
+mime!image/x-xbitmap!extensions = xbm
+mime!image/x-xpixmap!extensions = xpm
+mime!image/x-xwindowdump!extensions = xwd
+mime!model/iges!extensions = igs,iges
+mime!model/mesh!extensions = msh,mesh,silo
+mime!model/vrml!extensions = wrl,vrml
+mime!text/calendar!extensions = ics,icz
+mime!text/comma-separated-values!extensions = csv
+mime!text/css!extensions = css
+mime!text/h323!extensions = 323
+mime!text/html!extensions = html,htm,shtml
+mime!text/iuls!extensions = uls
+mime!text/mathml!extensions = mml
+mime!text/plain!extensions = asc,txt,text,diff,pot
+mime!text/richtext!extensions = rtx
+mime!text/rtf!extensions = rtf
+mime!text/scriptlet!extensions = sct,wsc
+mime!text/tab-separated-values!extensions = tsv
+mime!text/vnd.sun.j2me.app-descriptor!extensions = jad
+mime!text/vnd.wap.wml!extensions = wml
+mime!text/vnd.wap.wmlscript!extensions = wmls
+mime!text/x-boo!extensions = boo
+mime!text/x-c++hdr!extensions = h++,hpp,hxx,hh
+mime!text/x-c++src!extensions = c++,cpp,cxx,cc
+mime!text/x-chdr!extensions = h
+mime!text/x-component!extensions = htc
+mime!text/x-csh!extensions = csh
+mime!text/x-csrc!extensions = c
+mime!text/x-dsrc!extensions = d
+mime!text/x-haskell!extensions = hs
+mime!text/x-java!extensions = java
+mime!text/x-literate-haskell!extensions = lhs
+mime!text/x-moc!extensions = moc
+mime!text/x-pascal!extensions = p,pas
+mime!text/x-pcs-gcd!extensions = gcd
+mime!text/x-perl!extensions = pl,pm
+mime!text/x-python!extensions = py
+mime!text/x-setext!extensions = etx
+mime!text/x-sh!extensions = sh
+mime!text/x-tcl!extensions = tcl,tk
+mime!text/x-tex!extensions = tex,ltx,sty,cls
+mime!text/x-vcalendar!extensions = vcs
+mime!text/x-vcard!extensions = vcf
+mime!video/dl!extensions = dl
+mime!video/dv!extensions = dif,dv
+mime!video/fli!extensions = fli
+mime!video/gl!extensions = gl
+mime!video/mp4!extensions = mp4
+mime!video/mpeg!extensions = mpeg,mpg,mpe
+mime!video/quicktime!extensions = qt,mov
+mime!video/vnd.mpegurl!extensions = mxu
+mime!video/x-la-asf!extensions = lsf,lsx
+mime!video/x-mng!extensions = mng
+mime!video/x-ms-asf!extensions = asf,asx
+mime!video/x-ms-wm!extensions = wm
+mime!video/x-ms-wmv!extensions = wmv
+mime!video/x-ms-wmx!extensions = wmx
+mime!video/x-ms-wvx!extensions = wvx
+mime!video/x-msvideo!extensions = avi
+mime!video/x-sgi-movie!extensions = movie
+mime!x-conference/x-cooltalk!extensions = ice
+mime!x-world/x-vrml!extensions = vrm,vrml,wrl
@@ -1,15 +0,0 @@
-###############################################################################
-#
-# These are not MIME types, but we can treat them like that..
-#
-###############################################################################
-
-application/zip .zip
-application/rar .rar
-application/bzip2 .bz2
-application/gzip .gz
-application/x-tar .tar
-application/x-gzip .gz .tgz
-application/x-stuffit .sit .sea
-application/octetstream .7z
-application/octetstream .ace
Oops, something went wrong.

0 comments on commit be1b01e

Please sign in to comment.