starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 14:03:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

support api without /mediabrowser

Browse Source
This commit is contained in:
Luke Pulverenti
2015-01-17 14:30:23 -05:00
parent 5f3c2f68b0
commit a8da86d059
15 changed files with 71 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@@ -130,12 +130,12 @@ namespace MediaBrowser.Server.Startup.Common
{
var list = new List<string>
{
"http://+:" + ServerConfigurationManager.Configuration.HttpServerPortNumber + "/" + WebApplicationName + "/"
"http://+:" + ServerConfigurationManager.Configuration.HttpServerPortNumber + "/"
};
if (ServerConfigurationManager.Configuration.UseHttps)
{
list.Add("https://+:" + ServerConfigurationManager.Configuration.HttpsPortNumber + "/" + WebApplicationName + "/");
list.Add("https://+:" + ServerConfigurationManager.Configuration.HttpsPortNumber + "/");
}
return list;
@@ -472,7 +472,7 @@ namespace MediaBrowser.Server.Startup.Common
_supportsNativeWebSocket = false;
}
HttpServer = ServerFactory.CreateServer(this, LogManager, "Media Browser", WebApplicationName, "dashboard/index.html", false);
HttpServer = ServerFactory.CreateServer(this, LogManager, "Media Browser", "web/index.html", false);
RegisterSingleInstance(HttpServer, false);
progress.Report(10);
@@ -810,7 +810,7 @@ namespace MediaBrowser.Server.Startup.Common
{
try
{
ServerManager.Start(HttpServerUrlPrefixes, CertificatePath);
ServerManager.Start(HttpServerUrlPrefixes, ServerConfigurationManager.Configuration.CertificatePath);
}
catch (Exception ex)
{
@@ -977,8 +977,6 @@ namespace MediaBrowser.Server.Startup.Common
CachePath = ApplicationPaths.CachePath,
MacAddress = GetMacAddress(),
HttpServerPortNumber = HttpServerPort,
UseHttps = UseHttps,
CertificatePath = CertificatePath,
OperatingSystem = OperatingSystemDisplayName,
CanSelfRestart = CanSelfRestart,
CanSelfUpdate = CanSelfUpdate,
@@ -1053,16 +1051,6 @@ namespace MediaBrowser.Server.Startup.Common
get { return ServerConfigurationManager.Configuration.HttpServerPortNumber; }
}
public bool UseHttps
{
get { return this.ServerConfigurationManager.Configuration.UseHttps; }
}
public string CertificatePath
{
get { return this.ServerConfigurationManager.Configuration.CertificatePath; }
}
public int HttpsServerPort
{
get { return ServerConfigurationManager.Configuration.HttpsPortNumber; }