shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make cookie merging more robust (#669)

Browse Source
This commit is contained in:
kaso17
2016-11-10 08:37:52 +01:00
committed by GitHub
parent e7918bddbc
commit 7cfdaf4b41
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Jackett/Indexers/BaseIndexer.cs
View File

@@ -186,7 +186,7 @@ namespace Jackett.Indexers
private String ResolveCookies(String incomingCookies = "") private String ResolveCookies(String incomingCookies = "")
{ {
var redirRequestCookies = (CookieHeader != null && CookieHeader != "" ? CookieHeader + " " : "") + incomingCookies; var redirRequestCookies = (CookieHeader != null && CookieHeader != "" ? CookieHeader + " " : "") + incomingCookies;
System.Text.RegularExpressions.Regex expression = new System.Text.RegularExpressions.Regex(@"([^\s]+)=([^=]+)(?:\s|$)"); System.Text.RegularExpressions.Regex expression = new System.Text.RegularExpressions.Regex(@"([^\\,;\s]+)=([^=\\,;\s]+)");
Dictionary<string, string> cookieDIctionary = new Dictionary<string, string>(); Dictionary<string, string> cookieDIctionary = new Dictionary<string, string>();
var matches = expression.Match(redirRequestCookies); var matches = expression.Match(redirRequestCookies);
while (matches.Success) while (matches.Success)
@@ -194,7 +194,7 @@ namespace Jackett.Indexers
if (matches.Groups.Count > 2) cookieDIctionary[matches.Groups[1].Value] = matches.Groups[2].Value; if (matches.Groups.Count > 2) cookieDIctionary[matches.Groups[1].Value] = matches.Groups[2].Value;
matches = matches.NextMatch(); matches = matches.NextMatch();
} }
return string.Join(" ", cookieDIctionary.Select(kv => kv.Key.ToString() + "=" + kv.Value.ToString()).ToArray()); return string.Join("; ", cookieDIctionary.Select(kv => kv.Key.ToString() + "=" + kv.Value.ToString()).ToArray());
} }