This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit a9e27e2e0cdc3f65751a73059677bd0e486256fe
Author:     Jack Lau <[email protected]>
AuthorDate: Sun Jun 14 14:09:57 2026 +0800
Commit:     Jack Lau <[email protected]>
CommitDate: Tue Jun 23 22:44:20 2026 +0800

    avformat/tls_{openssl,mbedtls}: parse host when external_sock is true
    
    See 28b92b9b2e7abeb70b0aa050138e6e4b7cc26aed
    
    Signed-off-by: Jack Lau <[email protected]>
---
 libavformat/tls_mbedtls.c | 3 +++
 libavformat/tls_openssl.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c
index 07af7db27d..bfa5103596 100644
--- a/libavformat/tls_mbedtls.c
+++ b/libavformat/tls_mbedtls.c
@@ -509,6 +509,9 @@ static int tls_open(URLContext *h, const char *uri, int 
flags, AVDictionary **op
     if (!shr->external_sock) {
         if ((ret = ff_tls_open_underlying(shr, h, uri, options)) < 0)
             goto fail;
+    } else if (!shr->host) {
+        if ((ret = ff_tls_parse_host(shr, shr->underlying_host, 
sizeof(shr->underlying_host), NULL, uri)) < 0)
+            goto fail;
     }
 
 #ifdef MBEDTLS_PSA_CRYPTO_C
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index 7596a1a405..55e6e6b628 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -783,6 +783,9 @@ static int tls_open(URLContext *h, const char *uri, int 
flags, AVDictionary **op
     if (!c->tls_shared.external_sock) {
         if ((ret = ff_tls_open_underlying(&c->tls_shared, h, uri, options)) < 
0)
             goto fail;
+    } else if (!s->host) {
+        if ((ret = ff_tls_parse_host(s, s->underlying_host, 
sizeof(s->underlying_host), NULL, uri)) < 0)
+            goto fail;
     }
 
     // We want to support all versions of TLS >= 1.0, but not the deprecated

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to