[vlc-commits] demux: adaptive: don't disconnect socket at EOF if connectionClose is false

Zhao Zhili git at videolan.org
Wed Sep 27 16:24:01 CEST 2017


vlc | branch: master | Zhao Zhili <wantlamy at gmail.com> | Sun Aug  6 17:36:05 2017 +0800| [cf376a52ec3544b3e27d858e84c01976be66ea4e] | committer: Francois Cartegnie

demux: adaptive: don't disconnect socket at EOF if connectionClose is false

Signed-off-by: Francois Cartegnie <fcvlcdev at free.fr>

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

 modules/demux/adaptive/http/HTTPConnection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/http/HTTPConnection.cpp b/modules/demux/adaptive/http/HTTPConnection.cpp
index 72775baaee..91e3709a3c 100644
--- a/modules/demux/adaptive/http/HTTPConnection.cpp
+++ b/modules/demux/adaptive/http/HTTPConnection.cpp
@@ -196,7 +196,7 @@ ssize_t HTTPConnection::read(void *p_buffer, size_t len)
         bytesRead += ret;
 
     if(ret < 0 || (size_t)ret < len || /* set EOF */
-       contentLength == bytesRead )
+       (contentLength == bytesRead && connectionClose))
     {
         socket->disconnect();
         return ret;



More information about the vlc-commits mailing list