[vlc-commits] https: shutdown the TLS session explicitly

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec 20 23:55:57 2015 +0200| [03581271d3a024d9c504217fca02766cc8672a7e] | committer: Rémi Denis-Courmont

https: shutdown the TLS session explicitly

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

 modules/access/http/h1conn.c |    4 ++++
 modules/access/http/h2conn.c |    2 ++
 2 files changed, 6 insertions(+)

diff --git a/modules/access/http/h1conn.c b/modules/access/http/h1conn.c
index 2a8246f..3e029fe 100644
--- a/modules/access/http/h1conn.c
+++ b/modules/access/http/h1conn.c
@@ -125,6 +125,7 @@ static void *vlc_h1_stream_fatal(struct vlc_h1_conn *conn)
     if (conn->conn.tls != NULL)
     {
         msg_Dbg(CO(conn), "connection failed");
+        vlc_tls_Shutdown(conn->conn.tls, true);
         vlc_tls_Close(conn->conn.tls);
         conn->conn.tls = NULL;
     }
@@ -281,7 +282,10 @@ static void vlc_h1_conn_destroy(struct vlc_h1_conn *conn)
     assert(conn->released);
 
     if (conn->conn.tls != NULL)
+    {
+        vlc_tls_Shutdown(conn->conn.tls, true);
         vlc_tls_Close(conn->conn.tls);
+    }
     free(conn);
 }
 
diff --git a/modules/access/http/h2conn.c b/modules/access/http/h2conn.c
index c982a53..f772f99 100644
--- a/modules/access/http/h2conn.c
+++ b/modules/access/http/h2conn.c
@@ -657,6 +657,8 @@ static void vlc_h2_conn_destroy(struct vlc_h2_conn *conn)
     vlc_mutex_destroy(&conn->lock);
 
     vlc_h2_output_destroy(conn->out);
+    vlc_tls_Shutdown(conn->conn.tls, true);
+
     vlc_tls_Close(conn->conn.tls);
     free(conn);
 }