changeset 754:a77533b76084 trunk

[svn] - fix a ringbuffering error in curl which caused trouble with icecast2 MP3. Closes #816.
author nenolod
date Wed, 28 Feb 2007 17:52:11 -0800
parents 135c5f03ef8e
children efc2d680cac8
files ChangeLog src/curl/curl.c
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 28 17:33:16 2007 -0800
+++ b/ChangeLog	Wed Feb 28 17:52:11 2007 -0800
@@ -1,3 +1,11 @@
+2007-03-01 01:33:16 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1604]
+  - set timeout value to 3 seconds
+  
+  trunk/src/curl/curl.c |    4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+
+
 2007-02-28 15:32:41 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1602]
   - fix a stupid C++ error
--- a/src/curl/curl.c	Wed Feb 28 17:33:16 2007 -0800
+++ b/src/curl/curl.c	Wed Feb 28 17:52:11 2007 -0800
@@ -110,7 +110,7 @@
   cont_limit = handle->buffer_length - handle->wr_index;
   if (cont_limit < buffer_limit)
     buffer_limit = cont_limit;
-  if (handle->icy_interval)
+  if (handle->icy_interval && handle->icy_left)
     {
       if (handle->icy_left < buffer_limit)
 	buffer_limit = handle->icy_left;
@@ -605,7 +605,7 @@
 
   {
     struct curl_slist *hdr = NULL;
-    hdr = curl_slist_append(hdr, "icy-metadata:1");
+    hdr = curl_slist_append(hdr, "Icy-MetaData: 1");
     hdr = curl_slist_append(hdr, "User-Agent: Audacious/" VERSION " (curl transport)");
     curl_easy_setopt(handle->curl, CURLOPT_HTTPHEADER, hdr);
   }