diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-06-19 23:52:01 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-06-19 23:59:52 +0200 |
| commit | 5f2e3b886759e0822ff31c36ef10ca8df59fcf59 (patch) | |
| tree | d61ce53686713e37f34e1cd565a818740dbfc1f3 /tests/serverhelp.pm | |
| parent | bb4e7921e70637a43bb01952888fcb0870fb915f (diff) | |
tests: fix the HTTP/2 tests
The HTTP/2 tests brought with commit bf05606ef1f were using the internal
name 'http2' for the HTTP/2 server, while in fact that name was already
used for the second instance of the HTTP server. This made tests using
the second instance (like test 2050) fail after a HTTP/2 test had run.
The server is now known as HTTP/2 internally and within the <server>
section in test cases. 1700, 1701 and 1702 were updated accordingly.
Diffstat (limited to 'tests/serverhelp.pm')
| -rw-r--r-- | tests/serverhelp.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/serverhelp.pm b/tests/serverhelp.pm index e5818bc16..d6a06508d 100644 --- a/tests/serverhelp.pm +++ b/tests/serverhelp.pm @@ -105,7 +105,7 @@ sub servername_str { $proto = uc($proto) if($proto); die "unsupported protocol: '$proto'" unless($proto && - ($proto =~ /^(((FTP|HTTP|IMAP|POP3|SMTP|HTTP-PIPE)S?)|(TFTP|SFTP|SOCKS|SSH|RTSP|GOPHER|HTTPTLS|HTTP2))$/)); + ($proto =~ /^(((FTP|HTTP|HTTP\/2|IMAP|POP3|SMTP|HTTP-PIPE)S?)|(TFTP|SFTP|SOCKS|SSH|RTSP|GOPHER|HTTPTLS))$/)); $ipver = (not $ipver) ? 'ipv4' : lc($ipver); die "unsupported IP version: '$ipver'" unless($ipver && @@ -137,6 +137,7 @@ sub servername_canon { my ($proto, $ipver, $idnum) = @_; my $string = lc(servername_str($proto, $ipver, $idnum)); $string =~ tr/-/_/; + $string =~ s/\//_v/; return $string; } |