mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
detect SSL library properly and display it on startup
This commit is contained in:
parent
656a2e93d7
commit
177848ed27
@ -757,6 +757,7 @@ sub checkcurl {
|
|||||||
if($_ =~ /^curl/) {
|
if($_ =~ /^curl/) {
|
||||||
$curl = $_;
|
$curl = $_;
|
||||||
$curl =~ s/^(.*)(libcurl.*)/$1/g;
|
$curl =~ s/^(.*)(libcurl.*)/$1/g;
|
||||||
|
|
||||||
$libcurl = $2;
|
$libcurl = $2;
|
||||||
if($curl =~ /mingw32/) {
|
if($curl =~ /mingw32/) {
|
||||||
# This is a windows minw32 build, we need to translate the
|
# This is a windows minw32 build, we need to translate the
|
||||||
@ -813,11 +814,11 @@ sub checkcurl {
|
|||||||
# through a shell.
|
# through a shell.
|
||||||
chomp($pwd = `cygpath -m $pwd`);
|
chomp($pwd = `cygpath -m $pwd`);
|
||||||
}
|
}
|
||||||
elsif ($curl =~ /openssl/i) {
|
elsif ($libcurl =~ /openssl/i) {
|
||||||
# OpenSSL in use
|
# OpenSSL in use
|
||||||
$has_openssl=1;
|
$has_openssl=1;
|
||||||
}
|
}
|
||||||
elsif ($curl =~ /gnutls/i) {
|
elsif ($libcurl =~ /gnutls/i) {
|
||||||
# GnuTLS in use
|
# GnuTLS in use
|
||||||
$has_gnutls=1;
|
$has_gnutls=1;
|
||||||
}
|
}
|
||||||
@ -924,6 +925,12 @@ sub checkcurl {
|
|||||||
if($ftp_ipv6) {
|
if($ftp_ipv6) {
|
||||||
printf("* FTP IPv6 port: %d\n", $FTP6PORT);
|
printf("* FTP IPv6 port: %d\n", $FTP6PORT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if($ssl_version) {
|
||||||
|
printf("* SSL library: %s\n",
|
||||||
|
$has_gnutls?"GnuTLS":($has_openssl?"OpenSSL":"<unknown>"));
|
||||||
|
}
|
||||||
|
|
||||||
print "***************************************** \n";
|
print "***************************************** \n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user