Skip to content

Turn on by default new HttpClient implementation for .Net and .Net Fr… #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 12, 2022
Merged

Turn on by default new HttpClient implementation for .Net and .Net Fr… #558

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f3f854b
Turn on by default new HttpClient implementation for .Net and .Net Fr…
bpassaro95 Mar 2, 2022
c847d90
Merge branch 'master' into enable-newhttpclient-impl
bpassaro95 Mar 2, 2022
1cca75c
Merge branch 'master' into enable-newhttpclient-impl
claudiamurialdo Mar 13, 2022
71e033a
Improved condition that enables the usage of old HTTPClient implement…
bpassaro95 Apr 21, 2022
105e3f9
Merge branch 'enable-newhttpclient-impl' of https://github.com/genexu…
bpassaro95 Apr 21, 2022
4749b87
Fixed HttpHandler error
bpassaro95 Apr 21, 2022
f57edb8
Update GxHttpClient.cs
bpassaro95 Apr 21, 2022
f2baca4
Merge branch 'master' into enable-newhttpclient-impl
bpassaro95 May 12, 2022
abe53ef
Update GxHttpClient.cs
bpassaro95 May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
namespace GeneXus.Http.Client
{
using System;
using System.Text;
using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Globalization;
using System.IO;
using log4net;
using GeneXus.Application;
using System.Net;
using GeneXus.Configuration;
using GeneXus.Utils;
using System.Text.RegularExpressions;
using Mime;
using System.Collections;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Security;
using System.Security.Cryptography.X509Certificates;
using System.Collections.Generic;
using System.Globalization;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web.Services.Protocols;
using System.Web;
using System.Net.Http.Headers;
using System.Net.Http;
using System.Security;
using System.Web.Services.Protocols;
using GeneXus.Application;
using GeneXus.Configuration;
using GeneXus.Utils;
using log4net;
using Mime;


public interface IGxHttpClient
Expand Down Expand Up @@ -64,7 +64,6 @@ public class GxHttpClient : IGxHttpClient
Stream _receiveStream;
int _timeout = 30000;
short _statusCode = 0;
static int _maxConnPerRoute = Preferences.GetHttpClientMaxConnectionPerRoute();
string _proxyHost;
int _proxyPort;
short _errCode = 0;
Expand All @@ -83,8 +82,10 @@ public class GxHttpClient : IGxHttpClient
string _statusDescription = string.Empty;
IGxContext _context;
#if NETCORE
IWebProxy _proxyObject;

IWebProxy _proxyObject;
#else

WebProxy _proxyObject;
#endif
ArrayList _authCollection;
Expand Down Expand Up @@ -127,7 +128,9 @@ public Stream ReceiveStream
}
}


#if NETCORE
[SecuritySafeCritical]
private HttpClientHandler GetHandler()
{
return new HttpClientHandler();
Expand Down Expand Up @@ -619,7 +622,6 @@ HttpResponseMessage ExecuteRequest(string method, string requestUrl, CookieConta
handler.ServerCertificateValidationCallback = ((sender, certificate, chain, sslPolicyErrors) => ServicePointManager.ServerCertificateValidationCallback(sender, certificate, chain, sslPolicyErrors));
}
#endif
handler.MaxConnectionsPerServer = _maxConnPerRoute;
if (GXUtil.CompressResponse())
{
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
Expand Down Expand Up @@ -657,8 +659,8 @@ HttpResponseMessage ExecuteRequest(string method, string requestUrl, CookieConta
reqStream.Seek(0, SeekOrigin.Begin);
request.Content = new ByteArrayContent(reqStream.ToArray());
setHeaders(request, handler.CookieContainer);
response = client.SendAsync(request).GetAwaiter().GetResult();
}
response = client.SendAsync(request).GetAwaiter().GetResult();
}
}
return response;
}
Expand Down Expand Up @@ -717,7 +719,7 @@ void ReadReponseContent(HttpResponseMessage response)
}
public void Execute(string method, string name)
{
if (!Config.GetValueOf("useoldhttpclient", out string useOld) || useOld.StartsWith("y", StringComparison.OrdinalIgnoreCase))
if (Config.GetValueOf("useoldhttpclient", out string useOld) && useOld.StartsWith("y", StringComparison.OrdinalIgnoreCase))
{
WebExecute(method, name);
}
Expand Down Expand Up @@ -984,9 +986,9 @@ HttpWebRequest buildRequest(string method, string requestUrl, CookieContainer co
GXLogging.Debug(log, String.Format("Start HTTPClient buildRequest: requestUrl:{0} method:{1}", requestUrl, method));
int BytesRead;
Byte[] Buffer = new Byte[1024];
#pragma warning disable SYSLIB0014 // WebRequest
#pragma warning disable SYSLIB0014 // WebRequest
HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requestUrl);
#pragma warning disable SYSLIB0014 // WebRequest
#pragma warning disable SYSLIB0014 // WebRequest

if (GXUtil.CompressResponse())
{
Expand Down