[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: demux: adaptive: remove pipelining restriction for TLS
Hugo Beauzée-Luyssen (@chouquette)
gitlab at videolan.org
Fri Aug 27 12:30:07 UTC 2021
Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC
Commits:
1c203522 by Francois Cartegnie at 2021-08-27T12:17:47+00:00
demux: adaptive: remove pipelining restriction for TLS
was related to replaced API
refs #26012
(cherry picked from commit a62fd0338958704378a146f7070fbe443b9c2647)
- - - - -
38ff0a0f by Francois Cartegnie at 2021-08-27T12:17:47+00:00
demux: adaptive: reset keepalive for connection reuse
(cherry picked from commit a7e5e0a900771ae460bbd1dfa9dd1ec5cd8bd408)
- - - - -
2 changed files:
- modules/demux/adaptive/http/HTTPConnection.cpp
- modules/demux/adaptive/http/HTTPConnection.hpp
Changes:
=====================================
modules/demux/adaptive/http/HTTPConnection.cpp
=====================================
@@ -66,7 +66,7 @@ const std::string & AbstractConnection::getContentType() const
}
HTTPConnection::HTTPConnection(vlc_object_t *p_object_, AuthStorage *auth,
- Transport *socket_, const ConnectionParams &proxy, bool persistent)
+ Transport *socket_, const ConnectionParams &proxy)
: AbstractConnection( p_object_ )
{
transport = socket_;
@@ -79,7 +79,7 @@ HTTPConnection::HTTPConnection(vlc_object_t *p_object_, AuthStorage *auth,
queryOk = false;
retries = 0;
authStorage = auth;
- connectionClose = !persistent;
+ connectionClose = false;
chunked = false;
chunked_eof = false;
chunkLength = 0;
@@ -130,6 +130,7 @@ void HTTPConnection::disconnect()
queryOk = false;
bytesRead = 0;
contentLength = 0;
+ connectionClose = false;
chunked = false;
chunkLength = 0;
bytesRange = BytesRange();
@@ -611,14 +612,12 @@ AbstractConnection * NativeConnectionFactory::createConnection(vlc_object_t *p_o
}
else scheme = params.getScheme();
- const bool b_secure = (params.getScheme() == "https");
- Transport *socket = new (std::nothrow) Transport(b_secure);
+ Transport *socket = new (std::nothrow) Transport(params.getScheme() == "https");
if(!socket)
return NULL;
- /* disable pipelined tls until we have ticket/resume session support */
HTTPConnection *conn = new (std::nothrow)
- HTTPConnection(p_object, authStorage, socket, proxy, !b_secure);
+ HTTPConnection(p_object, authStorage, socket, proxy);
if(!conn)
{
delete socket;
=====================================
modules/demux/adaptive/http/HTTPConnection.hpp
=====================================
@@ -68,7 +68,7 @@ namespace adaptive
{
public:
HTTPConnection(vlc_object_t *, AuthStorage *, Transport *,
- const ConnectionParams &, bool = false);
+ const ConnectionParams &);
virtual ~HTTPConnection();
virtual bool canReuse (const ConnectionParams &) const;
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4c49c64e813be16b9b98e2e96717fab1f7912ee2...38ff0a0f1f45e91ee5b0ab2b7311499b1fdc609f
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4c49c64e813be16b9b98e2e96717fab1f7912ee2...38ff0a0f1f45e91ee5b0ab2b7311499b1fdc609f
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list