From 3d85e751b7b609bb364c5694bcd6fa102fdfe44f Mon Sep 17 00:00:00 2001 From: flightlevel Date: Sun, 10 Jun 2018 21:52:13 +1000 Subject: [PATCH] Rewrite rule: Handle no path after base path --- src/Jackett.Server/Middleware/RewriteRules.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Jackett.Server/Middleware/RewriteRules.cs b/src/Jackett.Server/Middleware/RewriteRules.cs index 3361b0d2b..2ff2fc2fd 100644 --- a/src/Jackett.Server/Middleware/RewriteRules.cs +++ b/src/Jackett.Server/Middleware/RewriteRules.cs @@ -12,9 +12,13 @@ namespace Jackett.Server.Middleware string serverBasePath = Helper.ServerService.BasePath() ?? string.Empty; - if (request.Path != null && request.Path.HasValue && serverBasePath.Length > 0 && request.Path.Value.StartsWith(serverBasePath, StringComparison.Ordinal)) + if (request.Path != null && request.Path.HasValue && serverBasePath.Length > 0 + && (request.Path.Value.StartsWith(serverBasePath + "/", StringComparison.Ordinal) + || request.Path.Value.Equals(serverBasePath, StringComparison.Ordinal))) { - request.Path = new PathString(request.Path.Value.Substring(serverBasePath.Length)); + string path = request.Path.Value.Substring(serverBasePath.Length); + path = string.IsNullOrEmpty(path) ? "/" : path; + request.Path = new PathString(path); } } }