From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sun, 9 Sep 2007 17:52:38 +0000 (+0000)
Subject: Default RTSP timeout value is 60 seconds, rather than never - closes #1163
X-Git-Tag: 0.9.0-test0~5724
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=66fe9a72ca4319ebcb46b7c56832e8728bafd8a0;p=vlc

Default RTSP timeout value is 60 seconds, rather than never - closes #1163
---

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 77fe3f0c92..bc98097c26 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -898,7 +898,9 @@ static int Play( demux_t *p_demux )
 
         /* Retrieve the timeout value and set up a timeout prevention thread */
         p_sys->i_timeout = p_sys->rtsp->sessionTimeoutParameter();
-        if( p_sys->i_timeout > 0 && !p_sys->p_timeout )
+        if( p_sys->i_timeout <= 0 )
+            p_sys->i_timeout = 60; /* default value from RFC2326 */
+        if( !p_sys->p_timeout )
         {
             msg_Dbg( p_demux, "We have a timeout of %d seconds",  p_sys->i_timeout );
             p_sys->p_timeout = (timeout_thread_t *)vlc_object_create( p_demux, sizeof(timeout_thread_t) );