[vlc-commits] commit: don't try http tunneling in case of error 404. Also add a debug message. ( Sébastien Escudier )

[git at videolan.org]

vlc | branch: master | Sébastien Escudier <sebastien-devel at celeos.eu> | Thu Oct  7 11:38:40 2010 +0200| [ed762d69aa8a4e41d6f681d8a951f736bbe8164f] | committer: Sébastien Escudier 

don't try http tunneling in case of error 404. Also add a debug message.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ed762d69aa8a4e41d6f681d8a951f736bbe8164f
---

 modules/demux/live555.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index e82207e..2d0c64f 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -651,7 +651,7 @@ describe:
                 goto describe;
             }
         }
-        else if( (i_code > 0) && !var_GetBool( p_demux, "rtsp-http" ) )
+        else if( i_code > 0 && i_code != 404 && !var_GetBool( p_demux, "rtsp-http" ) )
         {
             /* Perhaps a firewall is being annoying. Try HTTP tunneling mode */
             msg_Dbg( p_demux, "we will now try HTTP tunneling mode" );
@@ -664,6 +664,8 @@ describe:
         {
             if( i_code == 0 )
                 msg_Dbg( p_demux, "connection timeout" );
+            else
+                msg_Dbg( p_demux, "connection error %d", i_code );
             if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
             p_sys->rtsp = NULL;
         }