Merge pull request #5312 from BaronGreenback/FixFor5280

Emby.Dlna/Main/DlnaEntryPoint.cs

@@ -316,9 +316,12 @@ namespace Emby.Dlna.Main
                 _logger.LogInformation("Registering publisher for {0} on {1}", fullService, address);
 
                 var uri = new UriBuilder(_appHost.GetSmartApiUrl(address.Address) + descriptorUri);
-                // DLNA will only work over http, so we must reset to http:// : {port}
+                if (_appHost.PublishedServerUrl == null)
-                uri.Scheme = "http://";
+                {
-                uri.Port = _netConfig.HttpServerPortNumber;
+                    // DLNA will only work over http, so we must reset to http:// : {port}.
+                    uri.Scheme = "http";
+                    uri.Port = _netConfig.HttpServerPortNumber;
+                }
 
                 var device = new SsdpRootDevice
                 {

Emby.Server.Implementations/ApplicationHost.cs

@@ -135,6 +135,9 @@ namespace Emby.Server.Implementations
 
         public bool CoreStartupHasCompleted { get; private set; }
 
+        /// <inheritdoc />
+        public Uri PublishedServerUrl => _startupOptions.PublishedServerUrl;
+
         public virtual bool CanLaunchWebBrowser
         {
             get

MediaBrowser.Controller/IServerApplicationHost.cs

@@ -52,6 +52,11 @@ namespace MediaBrowser.Controller
         /// <value>The name of the friendly.</value>
         string FriendlyName { get; }
 
+        /// <summary>
+        /// Gets the configured published server url.
+        /// </summary>
+        Uri PublishedServerUrl { get; }
+
         /// <summary>
         /// Gets the system info.
         /// </summary>