Changeset 15430

Timestamp:

09/06/2008 11:03:06 AM (3 months ago)

Author:

elupus

Message:

changed: disable multi session connections agains libupnp's http server as it often stall on start the new session untill you finish the
other (or perhaps just continue to read)

Location:

branches/linuxport/XBMC/xbmc/FileSystem

Files:

• FileCurl.cpp (modified) (3 diffs)
• FileCurl.h (modified) (1 diff)

branches/linuxport/XBMC/xbmc/FileSystem/FileCurl.cpp

@@ -273 +273 @@
   m_curlHeaderList = NULL;
   m_opened = false;
+  m_multisession  = true;
+  m_seekable = true;
   m_useOldHttpVersion = false;
   m_timeout = 0;
@@ -591 +593 @@
     CLog::Log(LOGDEBUG,"FileCurl - file <%s> is a shoutcast stream. re-opening", m_url.c_str());
     throw new CRedirectException(new CFileShoutcast); 
+  }
+
+  m_multisession = false;
+  if(m_url.Left(5).Equals("http:") || m_url.Left(6).Equals("https:"))
+  {
+    m_multisession = true;
+    if(m_state->m_httpheader.GetValue("Server").Find("Portable SDK for UPnP devices") >= 0)
+    {
+      CLog::Log(LOGWARNING, "FileCurl - disabling multi session due to broken libupnp server");
+      m_multisession = false;
+    }
   }
 
@@ -666 +679 @@
 
   CReadState* oldstate = NULL;
-  if(m_url.Left(5).Equals("http:") || m_url.Left(6).Equals("https:"))
+  if(m_multisession)
   {
     CURL url(m_url);

branches/linuxport/XBMC/xbmc/FileSystem/FileCurl.h

@@ -129 +129 @@
       bool            m_useOldHttpVersion;
       bool            m_seekable;
+      bool            m_multisession;
       bool            m_binary;