Commit graph

122 commits

Author SHA1 Message Date
Thulinma
a1da1469e9 Merge branch 'development' into LTS_development 2020-07-13 14:59:02 +02:00
Thulinma
90c9d16a32 Added support for empty array as non-configured public address. 2020-07-13 14:58:53 +02:00
Thulinma
29bc96d8d7 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http.cpp
#	src/output/output_http_internal.cpp
#	src/output/output_http_internal.h
#	src/output/output_https.cpp
2020-03-06 15:20:38 +01:00
Thulinma
cd19cca36b Support for multiple public addresses, as well as proxy-overridden public addresses 2020-03-05 16:14:58 +01:00
Thulinma
131eb58c6a Backport of public URL setting to Open Source edition 2020-03-05 16:14:58 +01:00
Thulinma
eb8694052d Merge branch 'development' into LTS_development
# Conflicts:
#	lib/http_parser.cpp
2020-03-03 17:04:10 +01:00
Thulinma
793f6f7809 Split HTTP namespace up into http_parser.h and url.h, since the URL library can be useful stand-alone as well. 2020-02-28 16:39:24 +01:00
Thulinma
3b3377ae92 Merge branch 'development' into LTS_development 2020-01-23 16:59:15 +01:00
Thulinma
3992355a74 allow setting a starting time through url in stream.html
(Correct commit for a mistake by Carina *shakes fist angrily*)
2020-01-23 16:59:08 +01:00
Cat
3fffdffae3 Merge remote-tracking branch 'origin/development' into LTS_development 2019-11-14 16:22:04 +01:00
Cat
370bdc19a0 added support for IE incompatibility mode 2019-11-14 16:20:08 +01:00
Thulinma
7bffdfe644 Added global configuration mechanism and defaultStream support 2019-10-31 11:19:54 +01:00
Cat
cc36a2a506 allow setting a starting time through url in stream.html (Javascript part) 2019-10-31 11:19:54 +01:00
Cat
58f86bfc82 allow setting a starting time through url in stream.html (Javascript part) 2019-10-07 14:41:51 +02:00
Thulinma
4c3dfa829f Implemented certbot helper utility 2019-09-09 13:19:37 +02:00
Thulinma
ffaa0394db Implemented certbot helper utility 2019-09-09 13:16:45 +02:00
Thulinma
1e2469c9b5 Merge branch 'development' into LTS_development 2019-09-04 15:17:39 +02:00
Cat
87aac99c54 On stream.html, allow the forcing of a mimetype through url parameter 2019-09-04 12:31:39 +02:00
Thulinma
cc9e970ea3 More backports from Pro edition, among which HTTPS/TLS support 2019-07-13 14:23:59 +02:00
Thulinma
66890c4564 Robustified Socket::Connection, added debugging data for copies/assigns and Socket::Connetion::open() calls for proper socket re-use. 2019-06-30 22:36:29 +02:00
Thulinma
128f30bfb6 Fixed websockets in IE11. Bleep you, MS. -_- 2019-06-21 21:20:39 +02:00
Thulinma
d41b207cc5 Fixed websockets in IE11. Bleep you, MS. -_- 2019-06-19 10:44:03 +02:00
Thulinma
f05346e270 Merge branch 'development' into LTS_development 2019-05-13 17:16:53 +02:00
Thulinma
035496d198 Fixed info_* websocket not terminating on socket close 2019-05-13 17:16:22 +02:00
Thulinma
095a60e0ed HLS stream track selector support in index URLs, fixed source matching when multi-select or type-select is used, handle user agent exceptions in Output::selectDefaultTracks(), added Util::codecString to stream.h library, removed duplicate/wrong code from DASH/HLS outputs 2019-04-26 17:03:42 +02:00
Thulinma
b8415d09c6 HLS/DASH stream track selector support in index URLs, fixed source matching when multi-select or type-select is used, handle user agent exceptions in Output::selectDefaultTracks(), added Util::codecString to stream.h library, removed duplicate/wrong code from DASH/HLS outputs 2019-04-26 13:50:39 +02:00
Thulinma
467b1cc877 Pass GET params for .html page to stream URLs 2019-03-06 15:41:00 +01:00
Thulinma
9e1539a2b9 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_statistics.cpp
#	src/input/input_buffer.cpp
#	src/input/input_dtsc.cpp
#	src/input/input_ebml.cpp
#	src/input/input_flv.cpp
#	src/input/input_mp3.cpp
#	src/output/output_httpts.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_progressive_mp4.cpp
2019-01-25 23:57:42 +01:00
Thulinma
7565704fdc Fixed 32-bit compile issues 2019-01-25 23:49:56 +01:00
Thulinma
483b0007d1 Fixed info/json websockets staying open forever 2019-01-16 15:44:20 +01:00
Thulinma
80ef348025 Fixed info/json websockets staying open forever 2019-01-16 15:43:57 +01:00
Thulinma
c926637aec Merge branch 'development' into LTS_development 2018-12-19 15:47:22 +01:00
Cat
ac7659614a Embed rework 2018-12-19 15:34:26 +01:00
Thulinma
2861102483 Merge branch 'development' into LTS_development 2018-12-13 13:19:38 +01:00
Thulinma
081f91653e Updated capa for outputs 2018-12-13 13:18:12 +01:00
Thulinma
ec0b19b92c Socket library updates to support detecting sockets passed as FDs, removed use of peek() in HTTP request handler, fixed 100% CPU usage problem for unfinished HTTP requests 2018-11-28 12:01:57 +01:00
Thulinma
6a6dd5d7ed Socket library updates to support detecting sockets passed as FDs, removed use of peek() in HTTP request handler, fixed 100% CPU usage problem for unfinished HTTP requests 2018-11-28 11:59:54 +01:00
Thulinma
98e3940079 Robustify accesses to server config 2018-11-28 11:46:33 +01:00
Thulinma
ac92e09262 Robustify accesses to server config 2018-11-28 11:46:22 +01:00
Thulinma
109995809d Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http_internal.cpp
2018-11-13 16:35:12 +01:00
Thulinma
251dc5f171 Better onFail handling, better HTTP failure handling 2018-11-13 16:34:30 +01:00
Thulinma
855f431b59 Stream source no longer listed in internal HTTP outputs 2018-07-29 21:34:28 +02:00
Thulinma
4c34c5fbe5 Stream source no longer listed in internal HTTP outputs 2018-07-29 21:34:16 +02:00
Thulinma
0f0615236f Merge branch 'development' into LTS_development 2018-07-23 12:53:28 +02:00
Thulinma
d944d4600e Added CORS headers and OPTIONS/HEAD support for HTTP internal's onFail responses. 2018-07-23 12:53:23 +02:00
Thulinma
a084005644 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_mp4.cpp
2018-05-16 11:10:55 +02:00
Thulinma
ecbb48dbfe Fixed http_internal responses for offline streams 2018-05-16 10:47:14 +02:00
Thulinma
d46eaf22e5 Added support for HTTP parameters in HTTPS protocol 2018-04-04 16:32:25 +02:00
Thulinma
da5e15621e Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http_internal.cpp
2018-04-04 16:31:36 +02:00
Thulinma
e39599894f support for protocol detection in player.js internal default URL 2018-04-04 16:05:27 +02:00