Make NTLM tests depend on the NTLM feature at not SSL, since the NTLM support
is no longer only present when built with SSL support.
This commit is contained in:
@@ -43,9 +43,8 @@ Finally, this is the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -63,9 +63,8 @@ Finally, this is the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -43,9 +43,8 @@ Finally, this is the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -14,9 +14,8 @@ isn't because there's no Proxy-Authorization: NTLM header
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -64,9 +64,8 @@ Welcome to the end station
|
||||
<server>
|
||||
http
|
||||
</server>
|
||||
# NTLM only works if we are built with SSL
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<name>
|
||||
HTTP with proxy-requiring-NTLM to site-requiring-Digest
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
http
|
||||
</server>
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<name>
|
||||
HTTP POST with --proxy-ntlm and no SSL with no response
|
||||
|
||||
@@ -35,9 +35,8 @@ content for you
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# require SSL since we need that for NTLM
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -62,9 +62,8 @@ daniel
|
||||
<server>
|
||||
http
|
||||
</server>
|
||||
# NTLM requires SSL
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<name>
|
||||
HTTP proxy CONNECT auth NTLM
|
||||
|
||||
@@ -62,9 +62,8 @@ daniel
|
||||
<server>
|
||||
http
|
||||
</server>
|
||||
# NTLM requires SSL
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<name>
|
||||
HTTP proxy CONNECT auth NTLM and then POST
|
||||
|
||||
@@ -43,9 +43,8 @@ Finally, this is the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -45,9 +45,8 @@ Wrong password dude. Get it fixed and return.
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -58,9 +58,8 @@ Finally, this is the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -42,9 +42,8 @@ This IS the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -41,9 +41,8 @@ Finally, this is the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -75,9 +75,8 @@ Finally, this is the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -109,9 +109,8 @@ Finally, this is the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -61,9 +61,8 @@ Finally, this is the real page!
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
# NTLM only works if SSL-support is present
|
||||
<features>
|
||||
SSL
|
||||
NTLM
|
||||
</features>
|
||||
<server>
|
||||
http
|
||||
|
||||
@@ -115,6 +115,7 @@ my $http_ipv6; # set if HTTP server has IPv6 support
|
||||
my $has_ipv6; # set if libcurl is built with IPv6 support
|
||||
my $has_libz; # set if libcurl is built with libz support
|
||||
my $has_getrlimit; # set if system has getrlimit()
|
||||
my $has_ntlm; # set if libcurl is built with NTLM support
|
||||
|
||||
my $skipped=0; # number of tests skipped; reported in main loop
|
||||
my %skipped; # skipped{reason}=counter, reasons for skip
|
||||
@@ -819,6 +820,10 @@ sub checkcurl {
|
||||
if($feat =~ /libz/i) {
|
||||
$has_libz = 1;
|
||||
}
|
||||
if($feat =~ /NTLM/i) {
|
||||
# NTLM enabled
|
||||
$has_ntlm=1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(!$curl) {
|
||||
@@ -963,6 +968,11 @@ sub singletest {
|
||||
next;
|
||||
}
|
||||
}
|
||||
elsif($f eq "NTLM") {
|
||||
if($has_ntlm) {
|
||||
next;
|
||||
}
|
||||
}
|
||||
elsif($f eq "getrlimit") {
|
||||
if($has_getrlimit) {
|
||||
next;
|
||||
|
||||
Reference in New Issue
Block a user