From 2fbbddbe855d551a5acb5d9c514efba18c924c6e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 25 Aug 2010 00:56:14 +0200 Subject: gopher tests: revert parts of gopher in the pingpong server Introduced in the initial gopher commits, there was added logic to do GOPHER test serving in the pingpong server but as it resembles HTTP much more than FTP or SMTP, the gopher testing has been moved over to instead use the sws (HTTP) server. This change simply removes unused code. --- tests/serverhelp.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests/serverhelp.pm') diff --git a/tests/serverhelp.pm b/tests/serverhelp.pm index 8429b405a..34b155d0e 100644 --- a/tests/serverhelp.pm +++ b/tests/serverhelp.pm @@ -148,8 +148,7 @@ sub server_pidfilename { sub server_logfilename { my ($logdir, $proto, $ipver, $idnum) = @_; my $trailer = '_server.log'; - $trailer = '_stunnel.log' if(lc($proto) =~ /^(ftp|http|imap|pop3|smtp)s$/|| - lc($proto) eq 'gopher'); + $trailer = '_stunnel.log' if(lc($proto) =~ /^(ftp|http|imap|pop3|smtp)s$/); return "${logdir}/". servername_canon($proto, $ipver, $idnum) ."$trailer"; } @@ -190,7 +189,7 @@ sub server_outputfilename { sub mainsockf_pidfilename { my ($proto, $ipver, $idnum) = @_; die "unsupported protocol: $proto" unless($proto && - ((lc($proto) =~ /^(ftp|imap|pop3|smtp)s?$/) || lc($proto) eq 'gopher')); + (lc($proto) =~ /^(ftp|imap|pop3|smtp)s?$/)); my $trailer = (lc($proto) =~ /^ftps?$/) ? '_sockctrl.pid':'_sockfilt.pid'; return '.'. servername_canon($proto, $ipver, $idnum) ."$trailer"; } @@ -202,7 +201,7 @@ sub mainsockf_pidfilename { sub mainsockf_logfilename { my ($logdir, $proto, $ipver, $idnum) = @_; die "unsupported protocol: $proto" unless($proto && - ((lc($proto) =~ /^(ftp|imap|pop3|smtp)s?$/) || lc($proto) eq 'gopher')); + (lc($proto) =~ /^(ftp|imap|pop3|smtp)s?$/)); my $trailer = (lc($proto) =~ /^ftps?$/) ? '_sockctrl.log':'_sockfilt.log'; return "${logdir}/". servername_canon($proto, $ipver, $idnum) ."$trailer"; } -- cgit v1.2.3