[vlc-commits] https: ensure that SETTINGS frame is sent first

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec 14 19:49:35 2015 +0200| [c7de93e0f02f80f8cf13b4af4bee0a56f2ec6fcf] | committer: Rémi Denis-Courmont

https: ensure that SETTINGS frame is sent first

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

 modules/access/http/h2conn.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/access/http/h2conn.c b/modules/access/http/h2conn.c
index 8dcfa37..a206e1b 100644
--- a/modules/access/http/h2conn.c
+++ b/modules/access/http/h2conn.c
@@ -564,12 +564,6 @@ static void *vlc_h2_recv_thread(void *data)
     if (unlikely(parser == NULL))
         goto fail;
 
-    if (vlc_h2_output_send(conn->out, vlc_h2_frame_settings()))
-    {
-        vlc_h2_parse_destroy(parser);
-        goto fail;
-    }
-
     vlc_cleanup_push(cleanup_parser, parser);
     do
     {
@@ -616,7 +610,8 @@ struct vlc_h2_conn *vlc_h2_conn_create(struct vlc_tls *tls)
 
     vlc_mutex_init(&conn->lock);
 
-    if (vlc_clone(&conn->thread, vlc_h2_recv_thread, conn,
+    if (vlc_h2_output_send(conn->out, vlc_h2_frame_settings())
+     || vlc_clone(&conn->thread, vlc_h2_recv_thread, conn,
                   VLC_THREAD_PRIORITY_INPUT))
     {
         vlc_mutex_destroy(&conn->lock);