[vlc-commits] [Git][videolan/vlc][master] 2 commits: demux: adaptive: remove pipelining restriction for TLS
François Cartegnie (@fcartegnie)
gitlab at videolan.org
Sat Aug 21 09:36:41 UTC 2021
François Cartegnie pushed to branch master at VideoLAN / VLC
Commits:
a62fd033 by Francois Cartegnie at 2021-08-21T09:25:06+00:00
demux: adaptive: remove pipelining restriction for TLS
was related to replaced API
refs #26012
- - - - -
a7e5e0a9 by Francois Cartegnie at 2021-08-21T09:25:06+00:00
demux: adaptive: reset keepalive for connection reuse
- - - - -
2 changed files:
- modules/demux/adaptive/http/HTTPConnection.cpp
- modules/demux/adaptive/http/HTTPConnection.hpp
Changes:
=====================================
modules/demux/adaptive/http/HTTPConnection.cpp
=====================================
@@ -67,7 +67,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_;
@@ -82,7 +82,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;
@@ -133,6 +133,7 @@ void HTTPConnection::disconnect()
queryOk = false;
bytesRead = 0;
contentLength = 0;
+ connectionClose = false;
chunked = false;
chunkLength = 0;
bytesRange = BytesRange();
@@ -618,14 +619,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 nullptr;
- /* 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 override;
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f35b34c0a1a6b1c267c3f104217f0d7cbb9e4374...a7e5e0a900771ae460bbd1dfa9dd1ec5cd8bd408
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f35b34c0a1a6b1c267c3f104217f0d7cbb9e4374...a7e5e0a900771ae460bbd1dfa9dd1ec5cd8bd408
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list