runtests.pl: reapply accidental revert
Reapply an accidental, and unrelated, change committed in3c128966edwhich unwantedly reverted the preceding commitfcd5c2baff. Caused by doing a local rebase when `git am` did not apply cleanly, and most likely using a local base behind master.
This commit is contained in:
parent
e9be5ff61d
commit
e156c7f8ee
@ -670,11 +670,15 @@ sub checksystemfeatures {
|
|||||||
$feature{"alt-svc"} = $feat =~ /alt-svc/i;
|
$feature{"alt-svc"} = $feat =~ /alt-svc/i;
|
||||||
# HSTS support
|
# HSTS support
|
||||||
$feature{"HSTS"} = $feat =~ /HSTS/i;
|
$feature{"HSTS"} = $feat =~ /HSTS/i;
|
||||||
|
$feature{"asyn-rr"} = $feat =~ /asyn-rr/;
|
||||||
if($feat =~ /AsynchDNS/i) {
|
if($feat =~ /AsynchDNS/i) {
|
||||||
if(!$feature{"c-ares"}) {
|
if(!$feature{"c-ares"} || $feature{"asyn-rr"}) {
|
||||||
# this means threaded resolver
|
# this means threaded resolver
|
||||||
$feature{"threaded-resolver"} = 1;
|
$feature{"threaded-resolver"} = 1;
|
||||||
$resolver="threaded";
|
$resolver="threaded";
|
||||||
|
|
||||||
|
# does not count as "real" c-ares
|
||||||
|
$feature{"c-ares"} = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
# http2 enabled
|
# http2 enabled
|
||||||
@ -698,7 +702,6 @@ sub checksystemfeatures {
|
|||||||
# Thread-safe init
|
# Thread-safe init
|
||||||
$feature{"threadsafe"} = $feat =~ /threadsafe/i;
|
$feature{"threadsafe"} = $feat =~ /threadsafe/i;
|
||||||
$feature{"HTTPSRR"} = $feat =~ /HTTPSRR/;
|
$feature{"HTTPSRR"} = $feat =~ /HTTPSRR/;
|
||||||
$feature{"asyn-rr"} = $feat =~ /asyn-rr/;
|
|
||||||
}
|
}
|
||||||
#
|
#
|
||||||
# Test harness currently uses a non-stunnel server in order to
|
# Test harness currently uses a non-stunnel server in order to
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user