Skip to content

#232 HttpClient request and response compression handling #263

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

Open
ddemeyer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#232 HttpClient request and response compression handling #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions Source/ISHRemote/Trisoft.ISHRemote/Connection/InfoShareWcfSoapWithOpenIdConnectConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1726,7 +1726,20 @@ private XDocument LoadConnectionConfiguration()
handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
}
handler.SslProtocols = (System.Security.Authentication.SslProtocols)(SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13);
#if NET48
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
#else
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate | DecompressionMethods.Brotli;
#endif
var httpClient = new HttpClient(handler);
#if NET48
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip");
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("deflate");
#else
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip");
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("deflate");
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("br");
#endif
httpClient.Timeout = _connectionParameters.Timeout;
var connectionConfigurationUri = new Uri(InfoShareWSBaseUri, "connectionconfiguration.xml");
_logger.WriteDebug($"LoadConnectionConfiguration uri[{connectionConfigurationUri}] timeout[{httpClient.Timeout}]");
Expand Down
13 changes: 13 additions & 0 deletions Source/ISHRemote/Trisoft.ISHRemote/Connection/InfoShareWcfSoapWithWsTrustConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,20 @@ private XDocument LoadConnectionConfiguration()
handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
}
handler.SslProtocols = (System.Security.Authentication.SslProtocols)(SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13);
#if NET48
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
#else
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate | DecompressionMethods.Brotli;
#endif
var httpClient = new HttpClient(handler);
#if NET48
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip");
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("deflate");
#else
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip");
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("deflate");
httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("br");
#endif
httpClient.Timeout = _connectionParameters.Timeout;
var connectionConfigurationUri = new Uri(InfoShareWSBaseUri, "connectionconfiguration.xml");
_logger.WriteDebug($"LoadConnectionConfiguration uri[{connectionConfigurationUri}] timeout[{httpClient.Timeout}]");
Expand Down
14 changes: 14 additions & 0 deletions Source/ISHRemote/Trisoft.ISHRemote/Objects/Public/IshSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,24 @@ public IshSession(ILogger logger, string webServicesBaseUrl, string ishUserName,
}
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13;
handler.SslProtocols = (System.Security.Authentication.SslProtocols)(SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13);
#if NET48
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
#else
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate | DecompressionMethods.Brotli;
#endif

_httpClient = new HttpClient(handler)
{
Timeout = _timeout
};
#if NET48
_httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip");
_httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("deflate");
#else
_httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("gzip");
_httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("deflate");
_httpClient.DefaultRequestHeaders.AcceptEncoding.ParseAdd("br");
#endif
// webServicesBaseUrl should have trailing slash, otherwise .NET throws unhandy "Reference to undeclared entity 'raquo'." error
_webServicesBaseUri = (webServicesBaseUrl.EndsWith("/")) ? new Uri(webServicesBaseUrl) : new Uri(webServicesBaseUrl + "/");
_ishUserName = ishUserName == null ? Environment.UserName : ishUserName;
Expand Down
Loading