Commit graph

68 commits

Author SHA1 Message Date
Thulinma
6e644e493f Merge branch 'development' into LTS_development 2018-11-15 10:59:33 +01:00
Thulinma
739c132a61 Added CORS headers to HTTP error messages 2018-11-15 10:59:24 +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
df6862fb0a Generalized "rate" parameter, added start/stop/startunix/stopunix params for progressive HTTP outputs 2018-11-01 16:38:26 +01:00
Thulinma
b2995ea2db Fix statistics in Free edition 2018-10-15 13:43:51 +02:00
Thulinma
1d4980dca1 Merge branch 'development' into LTS_development 2018-09-08 16:15:55 +02:00
Thulinma
6226a05fe3 Fix incorrect sending of HTTP error response through Websocket connections. 2018-09-08 16:15:12 +02:00
Thulinma
c392e3f6f9 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.cpp
2018-08-30 13:53:21 +02:00
Thulinma
4f7b902453 JSON blocking fix + output reselect fix for early stream times 2018-08-30 13:52:27 +02:00
Thulinma
663356d3bc Merge branch 'development' into LTS_development 2018-07-26 16:24:06 +02:00
Thulinma
c0bab1d10d Magical fix for HTTP output selection not allowing slashes in the $-part. 2018-07-26 16:24:00 +02:00
Thulinma
93fd6d290d Merge branch 'development' into LTS_development 2018-07-09 16:42:43 +02:00
Thulinma
4710fcade4 Websockets now have unique session IDs per connection. 2018-07-09 16:42:38 +02:00
Thulinma
921e6827dc Updated generic HTTP output to support websockets. Added basic websocket JSON push support. 2018-07-04 11:50:49 +02:00
Thulinma
9104d68a5d Updated generic HTTP output to support websockets. Added basic websocket JSON push support. 2018-07-04 11:48:36 +02:00
Thulinma
3947fceeed Merge branch 'development' into LTS_development 2018-05-17 21:45:17 +02:00
Thulinma
b6f0b596b2 Add support for boolean options to HTTP-based outputs 2018-05-17 21:44:41 +02:00
Thulinma
d46eaf22e5 Added support for HTTP parameters in HTTPS protocol 2018-04-04 16:32:25 +02:00
Thulinma
e06b14ce77 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http.cpp
#	src/output/output_http_internal.cpp
2018-03-20 15:11:19 +01:00
Thulinma
b0bf1d14ec Added HTTP info.js websocket mode 2018-03-20 15:06:37 +01:00
Thulinma
27afc466e6 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http.cpp
#	src/output/output_progressive_mp4.cpp
#	src/output/output_progressive_mp4.h
2018-01-24 19:50:43 +01:00
Thulinma
105b1677d1 Generalized byte range request parsing 2018-01-24 19:21:23 +01:00
Thulinma
307d14f901 Added more ISO639 support (2-letter codes and conversions), improved audio/video/subtitle selection through HTTP connectors 2017-11-23 14:15:04 +01:00
Thulinma
e58a24c239 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_mp4.cpp
2017-11-07 14:30:19 +01:00
Thulinma
c4d036490f Fixed same-connection HTTP requests after any end of track is reached 2017-11-07 14:25:09 +01:00
Thulinma
8fbdafb288 Generalized recording, pimped. 2017-09-27 12:09:18 +02:00
Thulinma
bef46f969c Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	lib/stream.h
#	src/input/input.cpp
#	src/output/output_http_internal.cpp
2017-06-09 20:34:57 +02:00
Thulinma
26f74accdf MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output. 2017-06-09 20:31:20 +02:00
Thulinma
9ddfa97148 Added automatic User-Agent stream tagging 2017-04-18 12:33:54 +02:00
Thulinma
84e23f5e5d Fixed double-locking HTTP bug 2016-11-14 11:41:52 +01:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
5d4366fdf1 Added URL passthrough. 2016-05-19 15:37:44 +02:00
Thulinma
edb1d5ca67 Added generic session ID overrider. 2016-05-18 13:24:23 +02:00
Erik Zandvliet
d04774cab5 Use only session id when one is available, strips out user-agent multiples on apple devices. 2016-05-17 14:56:03 +02:00
Thulinma
263dee7b25 Added push-related API calls to controller, made outputs able to wait for playable streams. 2016-05-11 13:55:23 +02:00
Thulinma
9e85f255ef Suppress untrusted proxy messages if not relevant. 2016-05-03 17:01:46 +02:00
Thulinma
f4b296164e Fixed all semaphore instances not being cleaned up properly. 2016-05-03 12:13:58 +02:00
Thulinma
4c1760f5f7 Fixed IPv6 fix for trusted proxies. 2016-04-29 15:44:30 +02:00
Thulinma
dbe2b1f661 HLS now sends unique session IDs for splitting sessions from each other. 2016-04-22 16:17:28 +02:00
Thulinma
babbcf706a Add support for telling iOS devices apart by X-Playback-Session-Id and allow IPv6-mapped IPv4 addresses to be properly recognized by the trusted proxy setting. 2016-04-19 18:26:00 +02:00
Thulinma
08bab96a6a Fixed X-Real-IP header support. 2016-04-19 18:25:49 +02:00
Thulinma
cbaf4107f9 Silly mistake is silly. 2016-04-05 10:05:11 +02:00
Erik Zandvliet
c25a533729 Recording, HLS Push, UDP (Multicast) Input, Threaded TS 2016-02-12 16:30:33 +01:00
ozzay
1c3e143709 Recording functionality by Diederick Huijbers, slightly tweaked. 2016-02-12 16:29:08 +01:00
Erik Zandvliet
c0b5f0d4b1 X-Real-IP support 2016-02-12 16:29:08 +01:00
Thulinma
53febd82d1 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2016-02-12 16:18:54 +01:00
Thulinma
d56e7f1408 Added a proxy in Output for getting the host (by Erik Zandvliet) 2016-02-12 15:51:54 +01:00
Balder
689129e805 Merge branch 'development' into LTS_development 2015-11-19 14:04:22 +01:00
Balder
d8bfe8cebc Fixed ability to disable video or audio tracks from HTTP output. 2015-11-19 14:02:21 +01:00