| 
								
								
									 Thulinma | a15b3c20f1 | Merge branch 'development' into LTS_development # Conflicts:
#	src/controller/controller_api.cpp | 2020-07-15 19:30:40 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | b057698018 | Added api_endpoint API call to give local API endpoint address, added responses to local-only UDP API, added Socket::getSocketName(), added ability to discover current listening interface address and port for serveSocket-style functions | 2020-07-15 19:29:16 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | b3df058a3e | Merge branch 'development' into LTS_development | 2020-07-14 21:47:20 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | b45fd85b95 | Workaround bug in OBS v25 | 2020-07-14 21:47:11 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | b7e6cbbf89 | Merge branch 'development' into LTS_development # Conflicts:
#	src/output/output_hls.cpp | 2020-07-13 17:06:23 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 16bb689b7e | Removed appleCompat mode from TS/HLS outputs, now sends identical segments to all client devices | 2020-07-13 16:24:39 +02:00 |  | 
				
					
						| 
								
								
									 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 | 563fa752e4 | Merge branch 'development' into LTS_development | 2020-05-27 12:45:59 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | cc95702a36 | Fixed sourcery compile | 2020-05-27 12:39:12 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | d259f66b0f | Merge branch 'development' into LTS_development | 2020-05-27 11:53:34 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 43b7762ff8 | Added stylesheet merging support to sourcery | 2020-05-27 11:48:27 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | dd5d8815be | Merge branch 'development' into LTS_development | 2020-03-12 16:26:48 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 4a621ea5c0 | Fixed IP detection over HTTPS output | 2020-03-12 16:18:55 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | c2fd7af109 | Fix always on streams being misdetected when set to false. -_- | 2020-03-12 16:03:15 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 8d519d0fc5 | Merge branch 'development' into LTS_development | 2020-03-10 14:01:31 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 04a1b394dd | Fixed multiple public addresses in controller settings, fixed debug level being passed when set to default | 2020-03-10 14:01:21 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | a2beecee64 | Small fixup | 2020-03-09 21:00:08 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 69253082ca | Merge branch 'development' into LTS_development | 2020-03-09 20:01:43 +01:00 |  | 
				
					
						| 
								
								
									 Ramoe | 1d0e68c5a4 | Fixed MP4 output not setting Content-Length for HEAD/OPTIONS requests | 2020-03-09 19:58:57 +01: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 | 58276b8fbe | Switched hook order in certbot integration so it does not detect RENEWED_LINEAGE as CERTBOT_VALIDATION hook. | 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 | 27a2e596fd | Updated sourcery to be slightly more magical. Now supports replacing script tags with their contents as well as splitting a source file on a given string. | 2020-02-28 16:46:14 +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 | af87ab3552 | Fix stats JSON output of connector counts -_- | 2020-02-27 12:07:05 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 93d28526f7 | Merge branch 'development' into LTS_development # Conflicts:
#	src/controller/controller.cpp | 2020-02-26 16:09:22 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 10e965327a | Memory limit checking to help users create optimal configs | 2020-02-26 16:08:39 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 08e5ceca2b | Improvements and backports for HLS input | 2020-02-12 12:19:34 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 3e607d864e | Merge branch 'development' into LTS_development | 2020-02-12 12:19:23 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 9743f405a3 | Sudden timestamp jump message | 2020-02-12 12:19:12 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 7337285c8d | Fix debug level setting | 2020-02-12 12:18:16 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 38a5522832 | Fix controller segfault when source is very short | 2020-02-03 16:53:26 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | e9832ac723 | Added stats entry for RTSP pull input | 2020-02-03 16:34:05 +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 |  | 
				
					
						| 
								
								
									 Thulinma | d58e860a2c | HLS: support for handling and syncing on ISO8601 timestamps in input | 2020-01-23 13:55:08 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 384afb6508 | RTSP allow lowercase Content-[Tt]ype, fixed Soliton Systems RTSP server implementation | 2020-01-23 13:44:20 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | ead45b4fb8 | Fixes to playlist support | 2020-01-23 13:43:55 +01:00 |  | 
				
					
						| 
								
								
									 Erik Zandvliet | 907be3b1f4 | Playlist support | 2020-01-23 13:43:51 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 7beea43d31 | Added basic stream fallback feature, allowing to redirect to a different stream name on stream source load errors | 2020-01-23 13:43:31 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | a2e2ddae1e | Backport of 3.0 stream selectors | 2019-11-27 10:27:14 +01:00 |  | 
				
					
						| 
								
								
									 Ramkoemar | 9d1b3cfe98 | Support for clearkey encrypted HLS input and multithreaded HLS input playlist updating | 2019-11-27 10:26:55 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | c64160f4d8 | Merge branch 'development' into LTS_development | 2019-11-27 10:26:41 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 45b245ad4e | Improved input shutdown reason detection | 2019-11-27 10:25:50 +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 | aac698a1f1 | Added fix for licensing/updating through non-SSL proxy server | 2019-11-07 13:40:57 +01:00 |  |