generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Previous commit adjustments

Browse Source
This commit is contained in:
Yang Tse 2010-01-10 02:41:44 +00:00
parent 017c14cc99
commit aae97c998a
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/runtests.pl
View File

@ -961,8 +961,8 @@ sub runhttpsserver {
sub runpingpongserver { sub runpingpongserver {
my ($proto, $id, $verbose, $ipv6) = @_; my ($proto, $id, $verbose, $ipv6) = @_;
my $port; my $port;
my $ip = $HOSTIP; my $ip = ($ipv6 && ($ipv6 =~ /6$/)) ? "$HOST6IP" : "$HOSTIP";
my $ipvnum = 4; my $ipvnum = ($ipv6 && ($ipv6 =~ /6$/)) ? 6 : 4;
my $idnum = ($id && ($id =~ /^(\d+)$/) && ($id > 1)) ? $id : 1; my $idnum = ($id && ($id =~ /^(\d+)$/) && ($id > 1)) ? $id : 1;
my $srvrname; my $srvrname;
my $pidfile; my $pidfile;
@ -972,31 +972,25 @@ sub runpingpongserver {
if($proto eq "ftp") { if($proto eq "ftp") {
$port = ($idnum>1)?$FTP2PORT:$FTPPORT; $port = ($idnum>1)?$FTP2PORT:$FTPPORT;
if($ipv6) { if($ipvnum==6) {
# if IPv6, use a different setup # if IPv6, use a different setup
$port = $FTP6PORT; $port = $FTP6PORT;
} }
} }
elsif($proto eq "pop3") { elsif($proto eq "pop3") {
$port = ($ipv6) ? $POP36PORT : $POP3PORT; $port = ($ipvnum==6) ? $POP36PORT : $POP3PORT;
} }
elsif($proto eq "imap") { elsif($proto eq "imap") {
$port = ($ipv6) ? $IMAP6PORT : $IMAPPORT; $port = ($ipvnum==6) ? $IMAP6PORT : $IMAPPORT;
} }
elsif($proto eq "smtp") { elsif($proto eq "smtp") {
$port = ($ipv6) ? $SMTP6PORT : $SMTPPORT; $port = ($ipvnum==6) ? $SMTP6PORT : $SMTPPORT;
} }
else { else {
print STDERR "Unsupported protocol $proto!!\n"; print STDERR "Unsupported protocol $proto!!\n";
return 0; return 0;
} }
if($ipv6) {
# if IPv6, use a different setup
$ipvnum = 6;
$ip = $HOST6IP;
}
$pidfile = server_pidfilename($proto, $ipvnum, $idnum); $pidfile = server_pidfilename($proto, $ipvnum, $idnum);
# don't retry if the server doesn't work # don't retry if the server doesn't work
@ -1749,13 +1743,12 @@ sub checksystem {
logmsg sprintf("POP3/%d ", $POP3PORT); logmsg sprintf("POP3/%d ", $POP3PORT);
logmsg sprintf("IMAP/%d ", $IMAPPORT); logmsg sprintf("IMAP/%d ", $IMAPPORT);
logmsg sprintf("SMTP/%d\n", $SMTPPORT); logmsg sprintf("SMTP/%d\n", $SMTPPORT);
if($tftp_ipv6) { if($ftp_ipv6) {
logmsg sprintf("POP3-IPv6/%d ", $POP36PORT); logmsg sprintf("* POP3-IPv6/%d ", $POP36PORT);
logmsg sprintf("IMAP-IPv6/%d ", $IMAP6PORT); logmsg sprintf("IMAP-IPv6/%d ", $IMAP6PORT);
logmsg sprintf("SMTP-IPv6/%d ", $SMTP6PORT); logmsg sprintf("SMTP-IPv6/%d\n", $SMTP6PORT);
} }
$has_textaware = ($^O eq 'MSWin32') || ($^O eq 'msys'); $has_textaware = ($^O eq 'MSWin32') || ($^O eq 'msys');
logmsg "***************************************** \n"; logmsg "***************************************** \n";