aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-09-22 04:15:54 -04:00
Code

Now that it's been completely officially assigned, use application/ogg instead

Browse Source 
of application/x-ogg

svn path=/trunk/icecast/; revision=4336
This commit is contained in:
Michael Smith 2003-02-11 12:18:22 +00:00
parent a3ee7cf61a
commit 9f85a1e7c3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/format.c
View File

@ -29,7 +29,9 @@
format_type_t format_get_type(char *contenttype) format_type_t format_get_type(char *contenttype)
{ {
if(strcmp(contenttype, "application/x-ogg") == 0) if(strcmp(contenttype, "application/x-ogg") == 0)
return FORMAT_TYPE_VORBIS; return FORMAT_TYPE_VORBIS; /* Backwards compatibility */
else if(strcmp(contenttype, "application/ogg") == 0)
return FORMAT_TYPE_VORBIS; /* Now blessed by IANA */
else if(strcmp(contenttype, "audio/mpeg") == 0) else if(strcmp(contenttype, "audio/mpeg") == 0)
return FORMAT_TYPE_MP3; return FORMAT_TYPE_MP3;
else else
@ -40,7 +42,7 @@ char *format_get_mimetype(format_type_t type)
{ {
switch(type) { switch(type) {
case FORMAT_TYPE_VORBIS: case FORMAT_TYPE_VORBIS:
return "application/x-ogg"; return "application/ogg";
break; break;
case FORMAT_TYPE_MP3: case FORMAT_TYPE_MP3:
return "audio/mpeg"; return "audio/mpeg";

2
src/fserve.c
View File

@ -315,7 +315,7 @@ static char *fserve_content_type(char *path)
else { else {
/* Fallbacks for a few basic ones */ /* Fallbacks for a few basic ones */
if(!strcmp(ext, "ogg")) if(!strcmp(ext, "ogg"))
return "application/x-ogg"; return "application/ogg";
else if(!strcmp(ext, "mp3")) else if(!strcmp(ext, "mp3"))
return "audio/mpeg"; return "audio/mpeg";
else if(!strcmp(ext, "html")) else if(!strcmp(ext, "html"))