move the TLS detection block of win_url before creating WebRequest

pull/43346/head
Charles Crossan 6 years ago committed by Matt Clay
parent 3e9a390809
commit 35da8e8a04

@ -67,6 +67,16 @@ if ($status_code) {
} }
} }
# Enable TLS1.1/TLS1.2 if they're available but disabled (eg. .NET 4.5)
$security_protcols = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::SystemDefault
if ([Net.SecurityProtocolType].GetMember("Tls11").Count -gt 0) {
$security_protcols = $security_protcols -bor [Net.SecurityProtocolType]::Tls11
}
if ([Net.SecurityProtocolType].GetMember("Tls12").Count -gt 0) {
$security_protcols = $security_protcols -bor [Net.SecurityProtocolType]::Tls12
}
[Net.ServicePointManager]::SecurityProtocol = $security_protcols
$client = [System.Net.WebRequest]::Create($url) $client = [System.Net.WebRequest]::Create($url)
$client.Method = $method $client.Method = $method
$client.Timeout = $timeout * 1000 $client.Timeout = $timeout * 1000
@ -98,17 +108,6 @@ if (-not $validate_certs) {
[System.Net.ServicePointManager]::ServerCertificateValidationCallback = { $true } [System.Net.ServicePointManager]::ServerCertificateValidationCallback = { $true }
} }
# Enable TLS1.1/TLS1.2 if they're available but disabled (eg. .NET 4.5)
$security_protcols = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::SystemDefault
if ([Net.SecurityProtocolType].GetMember("Tls11").Count -gt 0) {
$security_protcols = $security_protcols -bor [Net.SecurityProtocolType]::Tls11
}
if ([Net.SecurityProtocolType].GetMember("Tls12").Count -gt 0) {
$security_protcols = $security_protcols -bor [Net.SecurityProtocolType]::Tls12
}
[Net.ServicePointManager]::SecurityProtocol = $security_protcols
if ($null -ne $content_type) { if ($null -ne $content_type) {
$client.ContentType = $content_type $client.ContentType = $content_type
} }

Loading…
Cancel
Save