aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-11-03 04:17:18 -05:00
Code

Ensure HTTPS protocol always behaves as expected

Browse Source
This commit is contained in:
Moritz Grimm 2020-01-24 12:01:11 +01:00
parent f906e03a39
commit 4fe8ea4526
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ezstream.1.in.in
View File

@ -184,9 +184,11 @@ Default:
.It Sy \&<protocol\ /\&> .It Sy \&<protocol\ /\&>
Transport protocol used to stream to the server: Transport protocol used to stream to the server:
.Pp .Pp
.Bl -tag -width HTTPS -compact .Bl -tag -width RoarAudio -compact
.It Ar HTTP .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 .It Ar HTTPS
HTTP over TLS. HTTP over TLS.
This option implies that \&<tls\ /\&> is set to This option implies that \&<tls\ /\&> is set to

3
src/stream.c
View File

@ -124,6 +124,9 @@ _stream_cfg_tls(struct stream *s, cfg_server_t cfg_server)
tls_req = SHOUT_TLS_AUTO; tls_req = SHOUT_TLS_AUTO;
break; break;
case CFG_TLS_REQUIRED: case CFG_TLS_REQUIRED:
if (CFG_PROTO_HTTPS == cfg_server_get_protocol(cfg_server))
tls_req = SHOUT_TLS_RFC2818;
else
tls_req = SHOUT_TLS_AUTO_NO_PLAIN; tls_req = SHOUT_TLS_AUTO_NO_PLAIN;
break; break;
default: default: