Commit 9f85a1e7 authored by Michael Smith's avatar Michael Smith
Browse files

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

of application/x-ogg

svn path=/trunk/icecast/; revision=4336
parent a3ee7cf6
...@@ -29,7 +29,9 @@ ...@@ -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) ...@@ -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";
......
...@@ -315,7 +315,7 @@ static char *fserve_content_type(char *path) ...@@ -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"))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment