Ticket #1361: stream-tolerance.patch

stream/http.c

@@ -211 +211 @@
 
                 switch( http_hdr->status_code ) {
                         case 200: // OK
+                        case 206: // Partial Content
                                 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") );
                                 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") );
                                 if( http_hdr->body_size>0 ) {
@@ -778 +779 @@
                 if( !strcasecmp(http_hdr->protocol, "ICY") ||
                      http_get_field(http_hdr, "Icy-MetaInt") ) {
                         switch( http_hdr->status_code ) {
-                                case 200: { // OK
+                                case 200: // OK
+                case 206: // Partial Content
+                {
                                         char *field_data;
                                         // If content-type == video/nsv we most likely have a winamp video stream 
                                         // otherwise it should be mp3. if there are more types consider adding mime type 
@@ -813 +816 @@
                 // Assume standard http if not ICY                      
                 switch( http_hdr->status_code ) {
                         case 200: // OK
+            case 206: // Partial Content
                                 // Look if we can use the Content-Type
                                 content_type = http_get_field( http_hdr, "Content-Type" );
                                 if( content_type!=NULL ) {

stream/stream_ftp.c

@@ -340 +340 @@
       s->eof = 1;
       return 0;
     }
+
+    // Send the NOOP command 
+    // some clients may handle telnet seq. as part of next command
+    FtpSendCmd("NOOP",p,rsp_txt);
+
     // Send the ABOR command
     // Ignore the return code as sometimes it fail with "nothing to abort"
     FtpSendCmd("ABOR",p,rsp_txt);

stream/stream_cddb.c

@@ -299 +299 @@
 
         switch(http_hdr->status_code) {
                 case 200:
+                case 206:
                         ret = reply_parser(http_hdr, cddb_data);
                         break;
                 case 400:
@@ -526 +527 @@
 
         switch(status) {
                 case 200:
+                case 206:
                         // Found exact match
                         ret = sscanf(http_hdr->body, "%d %99s %08lx %99s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
                         if( ret!=4 ) {