aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputStream_http.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-11-02 02:44:11 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-11-02 02:44:11 +0000
commitaab6515c52aebd5532ba6d5326196395928d39ba (patch)
treee1a6f6a49d3d43404906e792ca9fabf81557db3f /src/inputStream_http.c
parent9ef68105cb3fde47c15224054e1c6755c333018f (diff)
downloadmpd-aab6515c52aebd5532ba6d5326196395928d39ba.tar.gz
mpd-aab6515c52aebd5532ba6d5326196395928d39ba.tar.xz
mpd-aab6515c52aebd5532ba6d5326196395928d39ba.zip
patches for 0.11.5 bug fix from the following revision changes:
1993 2000 2001 2026 2028 2038 2078 2116 2163 2164 2230 2236 2270 2337 2339 2420 2426 git-svn-id: https://svn.musicpd.org/mpd/branches/branch-0.11.4-fixes@2461 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/inputStream_http.c')
-rw-r--r--src/inputStream_http.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/inputStream_http.c b/src/inputStream_http.c
index e12866ef6..2e0755d96 100644
--- a/src/inputStream_http.c
+++ b/src/inputStream_http.c
@@ -570,7 +570,9 @@ static int getHTTPHello(InputStream * inStream) {
else if(0 == strncmp(cur, "\r\nicy-metaint:", 14)) {
data->icyMetaint = atoi(cur+14);
}
- else if(0 == strncmp(cur, "\r\nicy-name:", 11)) {
+ else if(0 == strncmp(cur, "\r\nicy-name:", 11) ||
+ 0 == strncmp(cur, "\r\nice-name:", 11))
+ {
int incr = 11;
char * temp = strstr(cur+incr,"\r\n");
if(!temp) break;
@@ -601,7 +603,7 @@ static int getHTTPHello(InputStream * inStream) {
*temp = '\0';
if(inStream->mime) free(inStream->mime);
while(*(incr+cur) == ' ') incr++;
- inStream->mime = strdup(cur+15);
+ inStream->mime = strdup(cur+incr);
*temp = '\r';
}