Skip to content

Commit 2ebdbc2

Browse files
Merge pull request #1493 from nesc58/fix-culture
Ensure the correct culture is used
2 parents 25debfa + 67907ea commit 2ebdbc2

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

src/RestSharp/Authenticators/OAuth/Extensions/OAuthExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal static class OAuthExtensions
2222
{
2323
public static string ToRequestValue(this OAuthSignatureMethod signatureMethod)
2424
{
25-
var value = signatureMethod.ToString().ToUpper();
25+
var value = signatureMethod.ToString().ToUpperInvariant();
2626
var shaIndex = value.IndexOf("SHA", StringComparison.Ordinal);
2727

2828
return shaIndex > -1 ? value.Insert(shaIndex, "-") : value;

src/RestSharp/Authenticators/OAuth/OAuthTools.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ static string ConstructRequestUrl(Uri url)
191191
public static string ConcatenateRequestElements(string method, string url, WebPairCollection parameters)
192192
{
193193
// Separating &'s are not URL encoded
194-
var requestMethod = method.ToUpper().Then("&");
194+
var requestMethod = method.ToUpperInvariant().Then("&");
195195
var requestUrl = UrlEncodeRelaxed(ConstructRequestUrl(url.AsUri())).Then("&");
196196
var requestParameters = UrlEncodeRelaxed(NormalizeRequestParameters(parameters));
197197

src/RestSharp/Http.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public partial class Http : IHttp
3636
{
3737
const string LineBreak = "\r\n";
3838

39-
public string FormBoundary { get; } = "---------" + Guid.NewGuid().ToString().ToUpper();
39+
public string FormBoundary { get; } = "---------" + Guid.NewGuid().ToString().ToUpperInvariant();
4040

4141
// ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable
4242
static readonly Regex AddRangeRegex = new Regex("(\\w+)=(\\d+)-(\\d+)$");
@@ -53,7 +53,7 @@ public Http()
5353

5454
void AddSyncHeaderActions()
5555
{
56-
_restrictedHeaderActions.Add("Connection", (r, v) => { r.KeepAlive = v.ToLower().Contains("keep-alive"); });
56+
_restrictedHeaderActions.Add("Connection", (r, v) => { r.KeepAlive = v.ToLowerInvariant().Contains("keep-alive"); });
5757
_restrictedHeaderActions.Add("Content-Length", (r, v) => r.ContentLength = Convert.ToInt64(v));
5858
_restrictedHeaderActions.Add("Expect", (r, v) => r.Expect = v);
5959

src/RestSharp/RestClient.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ void AddHandler(Func<IDeserializer> deserializerFactory, params string[] content
268268

269269
void DoBuildUriValidations(IRestRequest request)
270270
{
271-
if (BaseUrl == null && !request.Resource.ToLower().StartsWith("http"))
271+
if (BaseUrl == null && !request.Resource.ToLowerInvariant().StartsWith("http"))
272272
throw new ArgumentOutOfRangeException(
273273
nameof(request),
274274
"Request resource doesn't contain a valid scheme for an empty client base URL"
@@ -547,8 +547,8 @@ IRestResponse<T> Deserialize<T>(IRestRequest request, IRestResponse raw)
547547
response = raw.ToAsyncResponse<T>();
548548

549549
// Only attempt to deserialize if the request has not errored due
550-
// to a transport or framework exception. HTTP errors should attempt to
551-
// be deserialized
550+
// to a transport or framework exception. HTTP errors should attempt to
551+
// be deserialized
552552
if (response.ErrorException == null)
553553
{
554554
var func = GetHandler(raw.ContentType);

src/RestSharp/Serializers/SerializeAsAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public string TransformName(string input)
7676
{
7777
NameStyle.CamelCase => name.ToCamelCase(Culture),
7878
NameStyle.PascalCase => name.ToPascalCase(Culture),
79-
NameStyle.LowerCase => name.ToLower(),
79+
NameStyle.LowerCase => name.ToLower(Culture),
8080
_ => input
8181
};
8282
}

src/RestSharp/Serializers/Xml/XmlDeserializer.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ protected virtual object Map(object x, XElement root)
182182
if (asType == typeof(bool))
183183
{
184184
var toConvert = value.ToString()
185-
.ToLower();
185+
.ToLower(Culture);
186186

187187
prop.SetValue(x, XmlConvert.ToBoolean(toConvert), null);
188188
}
@@ -366,7 +366,7 @@ object HandleListDerivative(XElement root, string propName, Type type)
366366

367367
if (!elements.Any())
368368
{
369-
var lowerName = name.ToLower().AsNamespaced(Namespace);
369+
var lowerName = name.ToLower(Culture).AsNamespaced(Namespace);
370370

371371
elements = root.Descendants(lowerName).ToList();
372372
}
@@ -385,7 +385,7 @@ object HandleListDerivative(XElement root, string propName, Type type)
385385

386386
if (!elements.Any())
387387
{
388-
var lowerName = name.ToLower().AsNamespaced(Namespace);
388+
var lowerName = name.ToLower(Culture).AsNamespaced(Namespace);
389389

390390
elements = root.Descendants()
391391
.Where(e => e.Name.LocalName.RemoveUnderscoresAndDashes() == lowerName)
@@ -448,7 +448,7 @@ protected virtual object GetValueFromXml(XElement root, XName name, PropertyInfo
448448

449449
protected virtual XElement GetElementByName(XElement root, XName name)
450450
{
451-
var lowerName = name.LocalName.ToLower().AsNamespaced(name.NamespaceName);
451+
var lowerName = name.LocalName.ToLower(Culture).AsNamespaced(name.NamespaceName);
452452
var camelName = name.LocalName.ToCamelCase(Culture).AsNamespaced(name.NamespaceName);
453453

454454
if (root.Element(name) != null)
@@ -487,7 +487,7 @@ protected virtual XAttribute GetAttributeByName(XElement root, XName name, bool
487487
: new List<XName>
488488
{
489489
name.LocalName,
490-
name.LocalName.ToLower()
490+
name.LocalName.ToLower(Culture)
491491
.AsNamespaced(name.NamespaceName),
492492
name.LocalName.ToCamelCase(Culture)
493493
.AsNamespaced(name.NamespaceName)

0 commit comments

Comments
 (0)