* httpd: Do not close the connection on timeout for rtsp.

(Make quicktime happy)

diff --git a/src/misc/httpd.c b/src/misc/httpd.c
index ea45f6e8c90af5bd5c1f3707d8d078e1ba61f373..f08bc498213c65a750fae1de0b1198ac5ac57cd7 100644 (file)
--- a/src/misc/httpd.c
+++ b/src/misc/httpd.c
@@ -1435,7 +1435,7 @@ static void httpd_ClientInit( httpd_client_t *cl )
 {
     cl->i_state = HTTPD_CLIENT_RECEIVING;
     cl->i_activity_date = mdate();
-    cl->i_activity_timeout = 50000000;
+    cl->i_activity_timeout = I64C(10000000);
     cl->i_buffer_size = 10000;
     cl->i_buffer = 0;
     cl->p_buffer = malloc( cl->i_buffer_size );
@@ -1843,6 +1843,10 @@ static void httpd_ClientRecv( httpd_client_t *cl )
     }
     cl->i_activity_date = mdate();
 
+    /* XXX: for QT I have to disable timeout. Try to find why */
+    if( cl->query.i_proto == HTTPD_PROTO_RTSP )
+        cl->i_activity_timeout = 0;
+
     /* Debugging only */
     if( cl->i_state == HTTPD_CLIENT_RECEIVE_DONE )
     {
@@ -2004,7 +2008,8 @@ static void httpd_HostThread( httpd_host_t *host )
 
             if( cl->i_ref < 0 || ( cl->i_ref == 0 &&
                 ( cl->i_state == HTTPD_CLIENT_DEAD ||
-                  cl->i_activity_date + cl->i_activity_timeout < mdate() ) ) )
+                  ( cl->i_activity_timeout > 0 &&
+                    cl->i_activity_date+cl->i_activity_timeout < mdate()) ) ) )
             {
                 char *ip;