Skip to content

Commit

Permalink
eol normalization: revert back PR798
Browse files Browse the repository at this point in the history
  • Loading branch information
Ersan Bozduman committed Jul 10, 2023
1 parent ba25ae0 commit 6e2b747
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 29 deletions.
49 changes: 24 additions & 25 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto eol=lf

* text=auto
# Check out the following as ln always for osx/linux/cygwin
*.sh text eol=lf
# *.sh text eol=lf

# Windows specific files should always be crlf on checkout
*.bat text eol=crlf
*.cmd text eol=crlf
*.ps1 text eol=crlf
# *.bat text eol=crlf
# *.cmd text eol=crlf
# *.ps1 text eol=crlf

###############################################################################
# Set default behavior for command prompt diff.
Expand All @@ -18,19 +17,19 @@
# default for csharp files.
# Note: This is only used by command line
###############################################################################
*.config text
*.cs text diff=csharp
*.csproj text
*.md text
*.msbuild text
*.nuspec text
*.pp text
*.ps1 text
*.sln text
*.tt text
*.txt text
*.xaml text
*.xml text
# *.config text
# *.cs text diff=csharp
# *.csproj text
# *.md text
# *.msbuild text
# *.nuspec text
# *.pp text
# *.ps1 text
# *.sln text
# *.tt text
# *.txt text
# *.xaml text
# *.xml text

###############################################################################
# Set the merge driver for project and solution files
Expand Down Expand Up @@ -60,12 +59,12 @@
#
# image files are treated as binary by default.
###############################################################################
*.bmp binary
*.jpeg binary
*.jpg binary
*.nupkg binary
*.png binary
*.sdf binary
# *.bmp binary
# *.jpeg binary
# *.jpg binary
# *.nupkg binary
# *.png binary
# *.sdf binary

###############################################################################
# diff behavior for common document formats
Expand Down
6 changes: 2 additions & 4 deletions Minio/Credentials/CertificateIdentityProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
*/

using System.Globalization;
using System.Security.Authentication;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Net;
using System.Web;
using CommunityToolkit.HighPerformance;
using Minio.DataModel;
Expand Down Expand Up @@ -122,9 +120,9 @@ public CertificateIdentityProvider Build()
var handler = new HttpClientHandler();
handler.ClientCertificateOptions = ClientCertificateOption.Manual;
#if (NET472_OR_GREATER || NET6_0_OR_GREATER)
handler.SslProtocols = SslProtocols.Tls12;
handler.SslProtocols = SslProtocols.Tls12;
#else
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11;
#endif
handler.ClientCertificates.Add(ClientCertificate);
HttpClient ??= new HttpClient(handler)
Expand Down

0 comments on commit 6e2b747

Please sign in to comment.