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

core: fix form encoding. resolves #4346 resolves #3061 (#6994)

Browse Source
This commit is contained in:
Diego Heras
2020-02-08 07:03:03 +01:00
committed by GitHub
parent 77a2264164
commit f770596354
6 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Jackett.Common/Utils/Clients/WebClient.cs
View File

@@ -1,8 +1,11 @@
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
using AutoMapper;
using Jackett.Common.Models.Config;
using Jackett.Common.Services.Interfaces;
@@ -184,5 +187,33 @@ namespace Jackett.Common.Utils.Clients
{
// nothing by default
}
/**
* This method does the same as FormUrlEncodedContent but with custom encoding instead of utf-8
* https://stackoverflow.com/a/13832544
*/
protected static ByteArrayContent FormUrlEncodedContentWithEncoding(
IEnumerable<KeyValuePair<string, string>> nameValueCollection, Encoding encoding)
{
// utf-8 / default
if (Encoding.UTF8.Equals(encoding) || encoding == null)
return new FormUrlEncodedContent(nameValueCollection);
// other encodings
var builder = new StringBuilder();
foreach (KeyValuePair<string, string> pair in nameValueCollection)
{
if (builder.Length > 0)
builder.Append('&');
builder.Append(HttpUtility.UrlEncode(pair.Key, encoding));
builder.Append('=');
builder.Append(HttpUtility.UrlEncode(pair.Value, encoding));
}
// HttpRuleParser.DefaultHttpEncoding == "latin1"
var data = Encoding.GetEncoding("latin1").GetBytes(builder.ToString());
var content = new ByteArrayContent(data);
content.Headers.ContentType = new MediaTypeHeaderValue("application/x-www-form-urlencoded");
return content;
}
}
}