Commit 4fe8ea45 authored by Moritz Grimm's avatar Moritz Grimm
Browse files

Ensure HTTPS protocol always behaves as expected

parent f906e03a
......@@ -184,9 +184,11 @@ Default:
.It Sy \&<protocol\ /\&>
Transport protocol used to stream to the server:
.Pp
.Bl -tag -width HTTPS -compact
.Bl -tag -width RoarAudio -compact
.It Ar HTTP
Plain-text HTTP
Plain-text HTTP.
The \&<tls\ /\&> option defines, if TLS via RFC2817 or RFC2818 is also
attempted.
.It Ar HTTPS
HTTP over TLS.
This option implies that \&<tls\ /\&> is set to
......
......@@ -124,7 +124,10 @@ _stream_cfg_tls(struct stream *s, cfg_server_t cfg_server)
tls_req = SHOUT_TLS_AUTO;
break;
case CFG_TLS_REQUIRED:
tls_req = SHOUT_TLS_AUTO_NO_PLAIN;
if (CFG_PROTO_HTTPS == cfg_server_get_protocol(cfg_server))
tls_req = SHOUT_TLS_RFC2818;
else
tls_req = SHOUT_TLS_AUTO_NO_PLAIN;
break;
default:
log_error("stream: %s: tls: invalid", s->name);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment