[vlc-devel] commit: HTTPS out: handle cert paths from the sout chain, not just config ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 0.9-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  9 17:20:21 2009 +0300| [07002ee504c7d35fdd393fd1e3476842523a0dd3] | committer: Rémi Denis-Courmont 

HTTPS out: handle cert paths from the sout chain, not just config

Note that all outputs onto the same TCP port must have the same certificates.
(cherry picked from commit 123d3e483ab9cbc8346fd49a513e3285040c3faa)

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

 modules/access_output/http.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 8b194fc..1243e1e 100644
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -214,10 +214,10 @@ static int Open( vlc_object_t *p_this )
     /* SSL support */
     if( p_access->psz_access && !strcmp( p_access->psz_access, "https" ) )
     {
-        psz_cert = config_GetPsz( p_this, SOUT_CFG_PREFIX"cert" );
-        psz_key = config_GetPsz( p_this, SOUT_CFG_PREFIX"key" );
-        psz_ca = config_GetPsz( p_this, SOUT_CFG_PREFIX"ca" );
-        psz_crl = config_GetPsz( p_this, SOUT_CFG_PREFIX"crl" );
+        psz_cert = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"cert" );
+        psz_key = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"key" );
+        psz_ca = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"ca" );
+        psz_crl = var_CreateGetNonEmptyString( p_this, SOUT_CFG_PREFIX"crl" );
 
         if( i_bind_port <= 0 )
             i_bind_port = DEFAULT_SSL_PORT;