Skip to content

Commit

Permalink
git-svn-id: svn://cherokee-project.com/cherokee/trunk@2573 5dc97367-9…
Browse files Browse the repository at this point in the history
…7f1-0310-9951-d761b3857238
  • Loading branch information
alobbs committed Dec 8, 2008
1 parent 14efdd8 commit aa648c6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
2008-12-08 Alvaro Lopez Ortega <alvaro@octality.com>

* cherokee.conf.sample.pre: The new "Ogg Media Types" have been
added: http://www.ietf.org/rfc/rfc5334.txt. It implements RFE:
http://code.google.com/p/cherokee/issues/detail?id=262

* cherokee/handler_mirror.c, cherokee/handler_fcgi.c,
cherokee/handler_scgi.c: Integrates the FastCGI, SCGI and TCP
balancer with the latest cherokee_balancer_t modifications.
Expand Down
5 changes: 3 additions & 2 deletions cherokee.conf.sample.pre
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,13 @@ 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/ogg!extensions = ogx
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
Expand Down Expand Up @@ -260,6 +259,7 @@ 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/ogg!extensions = ogg,oga
mime!audio/prs.sid!extensions = sid
mime!audio/x-aiff!extensions = aif,aiff,aifc
mime!audio/x-gsm!extensions = gsm
Expand Down Expand Up @@ -359,6 +359,7 @@ mime!video/fli!extensions = fli
mime!video/gl!extensions = gl
mime!video/mp4!extensions = mp4
mime!video/mpeg!extensions = mpeg,mpg,mpe
mime!video/ogg!extensions = ogv
mime!video/quicktime!extensions = qt,mov
mime!video/vnd.mpegurl!extensions = mxu
mime!video/x-la-asf!extensions = lsf,lsx
Expand Down

0 comments on commit aa648c6

Please sign in to comment.