summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/FILEFORMAT2
-rw-r--r--tests/README2
-rw-r--r--tests/data/test14352
-rw-r--r--tests/data/test14362
-rw-r--r--tests/data/test20132
-rw-r--r--tests/data/test20142
-rw-r--r--tests/data/test20152
-rw-r--r--tests/data/test20162
-rw-r--r--tests/data/test20172
-rw-r--r--tests/data/test20182
-rw-r--r--tests/data/test20192
-rw-r--r--tests/data/test20202
-rw-r--r--tests/data/test20212
-rw-r--r--tests/data/test20222
-rw-r--r--tests/data/test5742
-rw-r--r--tests/data/test5762
-rwxr-xr-xtests/httpserver.pl2
-rwxr-xr-xtests/runtests.pl28
-rw-r--r--tests/server/sws.c6
-rw-r--r--tests/server/tftpd.c2
20 files changed, 35 insertions, 35 deletions
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 1637357c8..3b46e2893 100644
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -333,7 +333,7 @@ Available substitute variables include:
%HOSTIP - IPv4 address of the host running this test
%HTTP6PORT - IPv6 port number of the HTTP server
%HTTPPIPEPORT - Port number of the HTTP pipelining server
-%HTTPUNIXPATH - Path to the UNIX socket of the HTTP server
+%HTTPUNIXPATH - Path to the Unix socket of the HTTP server
%HTTPPORT - Port number of the HTTP server
%HTTPSPORT - Port number of the HTTPS server
%HTTPTLS6PORT - IPv6 port number of the HTTP TLS server
diff --git a/tests/README b/tests/README
index 7ef7f81d2..a8b8adcee 100644
--- a/tests/README
+++ b/tests/README
@@ -81,7 +81,7 @@ The cURL Test Suite
machine, or just move the servers in case you have local services on any of
those ports.
- The HTTP server supports listening on a UNIX domain socket, the default
+ The HTTP server supports listening on a Unix domain socket, the default
location is 'http.sock'.
1.4 Run
diff --git a/tests/data/test1435 b/tests/data/test1435
index 56ff9d11e..bd171a453 100644
--- a/tests/data/test1435
+++ b/tests/data/test1435
@@ -25,7 +25,7 @@ unix-sockets
http-unix
</server>
<name>
-simple HTTP GET over UNIX socket
+simple HTTP GET over Unix socket
</name>
<command>
--unix-socket %HTTPUNIXPATH http://server-interpreted.example.com/1435
diff --git a/tests/data/test1436 b/tests/data/test1436
index b16eadde0..e40a3bf4b 100644
--- a/tests/data/test1436
+++ b/tests/data/test1436
@@ -39,7 +39,7 @@ unix-sockets
http-unix
</server>
<name>
-HTTP requests with multiple connections over UNIX socket
+HTTP requests with multiple connections over Unix socket
</name>
<command>
--unix-socket %HTTPUNIXPATH http://one.example.com/14360001 http://two.example.com/14360002 http://one.example.com/14360003
diff --git a/tests/data/test2013 b/tests/data/test2013
index 60e85f3ea..0985b32de 100644
--- a/tests/data/test2013
+++ b/tests/data/test2013
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX absolute path
+Metalink local XML file, attempt Unix absolute path
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2013.metalink
diff --git a/tests/data/test2014 b/tests/data/test2014
index 01dc8b31b..d2dbdc7a7 100644
--- a/tests/data/test2014
+++ b/tests/data/test2014
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX path relative to current
+Metalink local XML file, attempt Unix path relative to current
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2014.metalink
diff --git a/tests/data/test2015 b/tests/data/test2015
index e4d09d50e..a35f3117d 100644
--- a/tests/data/test2015
+++ b/tests/data/test2015
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX path relative to upper
+Metalink local XML file, attempt Unix path relative to upper
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2015.metalink
diff --git a/tests/data/test2016 b/tests/data/test2016
index fbd6cd5d6..572aa65c5 100644
--- a/tests/data/test2016
+++ b/tests/data/test2016
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX path traversal
+Metalink local XML file, attempt Unix path traversal
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2016.metalink
diff --git a/tests/data/test2017 b/tests/data/test2017
index 52df14e38..15fd9347c 100644
--- a/tests/data/test2017
+++ b/tests/data/test2017
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX home path traversal
+Metalink local XML file, attempt Unix home path traversal
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2017.metalink
diff --git a/tests/data/test2018 b/tests/data/test2018
index b76233e1a..6d0652dcc 100644
--- a/tests/data/test2018
+++ b/tests/data/test2018
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX questionable file name I
+Metalink local XML file, attempt Unix questionable file name I
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2018.metalink
diff --git a/tests/data/test2019 b/tests/data/test2019
index cd098040b..b17b3f23f 100644
--- a/tests/data/test2019
+++ b/tests/data/test2019
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX questionable file name II
+Metalink local XML file, attempt Unix questionable file name II
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2019.metalink
diff --git a/tests/data/test2020 b/tests/data/test2020
index f89600b64..8bf85a4d7 100644
--- a/tests/data/test2020
+++ b/tests/data/test2020
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX questionable file name III
+Metalink local XML file, attempt Unix questionable file name III
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2020.metalink
diff --git a/tests/data/test2021 b/tests/data/test2021
index 133eb1678..20a92244a 100644
--- a/tests/data/test2021
+++ b/tests/data/test2021
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX questionable file name IV
+Metalink local XML file, attempt Unix questionable file name IV
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2021.metalink
diff --git a/tests/data/test2022 b/tests/data/test2022
index 8cb0df520..4f4efd176 100644
--- a/tests/data/test2022
+++ b/tests/data/test2022
@@ -35,7 +35,7 @@ file
Metalink
</features>
<name>
-Metalink local XML file, attempt UNIX questionable file name V
+Metalink local XML file, attempt Unix questionable file name V
</name>
<command option="no-output,no-include">
--metalink file://%PWD/log/test2022.metalink
diff --git a/tests/data/test574 b/tests/data/test574
index c1584480c..cb41f03ec 100644
--- a/tests/data/test574
+++ b/tests/data/test574
@@ -25,7 +25,7 @@ ftp
lib574
</tool>
<name>
-FTP wildcard download - changed fnmatch, 2x perform (UNIX LIST response)
+FTP wildcard download - changed fnmatch, 2x perform (Unix LIST response)
</name>
<command>
ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt
diff --git a/tests/data/test576 b/tests/data/test576
index 52a6664f1..74a3aedd1 100644
--- a/tests/data/test576
+++ b/tests/data/test576
@@ -22,7 +22,7 @@ ftp
lib576
</tool>
<name>
-FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (UNIX)
+FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (Unix)
</name>
<command>
ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*
diff --git a/tests/httpserver.pl b/tests/httpserver.pl
index 1b8c3d284..b60dadc3b 100755
--- a/tests/httpserver.pl
+++ b/tests/httpserver.pl
@@ -36,7 +36,7 @@ use serverhelp qw(
my $verbose = 0; # set to 1 for debugging
my $port = 8990; # just a default
-my $unix_socket; # location to place a listening UNIX socket
+my $unix_socket; # location to place a listening Unix socket
my $ipvnum = 4; # default IP version of http server
my $idnum = 1; # dafault http server instance number
my $proto = 'http'; # protocol the http server speaks
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 6b1a502d7..cac74aa47 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -141,7 +141,7 @@ my $HTTPTLSPORT; # HTTP TLS (non-stunnel) server port
my $HTTPTLS6PORT; # HTTP TLS (non-stunnel) IPv6 server port
my $HTTPPROXYPORT; # HTTP proxy port, when using CONNECT
my $HTTPPIPEPORT; # HTTP pipelining port
-my $HTTPUNIXPATH; # HTTP server UNIX domain socket path
+my $HTTPUNIXPATH; # HTTP server Unix domain socket path
my $srcdir = $ENV{'srcdir'} || '.';
my $CURL="../src/curl".exe_ext(); # what curl executable to run on the tests
@@ -203,12 +203,12 @@ my $ssl_version; # set if libcurl is built with SSL support
my $large_file; # set if libcurl is built with large file support
my $has_idn; # set if libcurl is built with IDN support
my $http_ipv6; # set if HTTP server has IPv6 support
-my $http_unix; # set if HTTP server has UNIX sockets support
+my $http_unix; # set if HTTP server has Unix sockets support
my $ftp_ipv6; # set if FTP server has IPv6 support
my $tftp_ipv6; # set if TFTP server has IPv6 support
my $gopher_ipv6; # set if Gopher server has IPv6 support
my $has_ipv6; # set if libcurl is built with IPv6 support
-my $has_unix; # set if libcurl is built with UNIX sockets support
+my $has_unix; # set if libcurl is built with Unix sockets 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
@@ -317,7 +317,7 @@ my $USER = $ENV{USER}; # Linux
if (!$USER) {
$USER = $ENV{USERNAME}; # Windows
if (!$USER) {
- $USER = $ENV{LOGNAME}; # Some UNIX (I think)
+ $USER = $ENV{LOGNAME}; # Some Unix (I think)
}
}
@@ -726,7 +726,7 @@ sub verifyhttp {
my $server = servername_id($proto, $ipvnum, $idnum);
my $pid = 0;
my $bonus="";
- # $port_or_path contains a path for UNIX sockets, sws ignores the port
+ # $port_or_path contains a path for Unix sockets, sws ignores the port
my $port = ($ipvnum eq "unix") ? 80 : $port_or_path;
my $verifyout = "$LOGDIR/".
@@ -1215,7 +1215,7 @@ sub runhttpserver {
$verbose_flag .= "1 ";
}
elsif($alt eq "unix") {
- # IP (protocol) is mutually exclusive with UNIX sockets
+ # IP (protocol) is mutually exclusive with Unix sockets
$ipvnum = "unix";
}
@@ -2118,7 +2118,7 @@ sub responsive_http_server {
$idnum = 2;
}
elsif($alt eq "unix") {
- # IP (protocol) is mutually exclusive with UNIX sockets
+ # IP (protocol) is mutually exclusive with Unix sockets
$ipvnum = "unix";
}
@@ -2373,7 +2373,7 @@ sub checksystem {
# Generate a "proto-ipv6" version of each protocol to match the
# IPv6 <server> name and a "proto-unix" to match the variant which
- # uses UNIX domain sockets. This works even if support isn't
+ # uses Unix domain sockets. This works even if support isn't
# compiled in because the <features> test will fail.
push @protocols, map(("$_-ipv6", "$_-unix"), @protocols);
@@ -2548,7 +2548,7 @@ sub checksystem {
}
if($has_unix) {
- # client has UNIX sockets support, check whether the HTTP server has it
+ # client has Unix sockets support, check whether the HTTP server has it
my @sws = `server/sws --version`;
$http_unix = 1 if($sws[0] =~ /unix/);
}
@@ -2584,7 +2584,7 @@ sub checksystem {
logmsg sprintf(" track memory: %s\n", $has_memory_tracking?"ON ":"OFF");
logmsg sprintf("* valgrind: %8s", $valgrind?"ON ":"OFF");
logmsg sprintf(" HTTP IPv6 %s\n", $http_ipv6?"ON ":"OFF");
- logmsg sprintf("* HTTP UNIX %s\n", $http_unix?"ON ":"OFF");
+ logmsg sprintf("* HTTP Unix %s\n", $http_unix?"ON ":"OFF");
logmsg sprintf("* FTP IPv6 %8s", $ftp_ipv6?"ON ":"OFF");
logmsg sprintf(" Libtool lib: %s\n", $libtool?"ON ":"OFF");
logmsg sprintf("* Shared build: %-3s", $has_shared);
@@ -2638,9 +2638,9 @@ sub checksystem {
logmsg sprintf("* HTTP-PIPE/%d \n", $HTTPPIPEPORT);
if($has_unix) {
- logmsg "* UNIX socket paths:\n";
+ logmsg "* Unix socket paths:\n";
if($http_unix) {
- logmsg sprintf("* HTTP-UNIX:%s\n", $HTTPUNIXPATH);
+ logmsg sprintf("* HTTP-Unix:%s\n", $HTTPUNIXPATH);
}
}
@@ -2692,7 +2692,7 @@ sub subVariables {
$$thing =~ s/%TFTP6PORT/$TFTP6PORT/g;
$$thing =~ s/%TFTPPORT/$TFTPPORT/g;
- # server UNIX domain socket paths
+ # server Unix domain socket paths
$$thing =~ s/%HTTPUNIXPATH/$HTTPUNIXPATH/g;
@@ -4962,7 +4962,7 @@ $HTTPTLSPORT = $base++; # HTTP TLS (non-stunnel) server port
$HTTPTLS6PORT = $base++; # HTTP TLS (non-stunnel) IPv6 server port
$HTTPPROXYPORT = $base++; # HTTP proxy port, when using CONNECT
$HTTPPIPEPORT = $base++; # HTTP pipelining port
-$HTTPUNIXPATH = 'http.sock'; # HTTP server UNIX domain socket path
+$HTTPUNIXPATH = 'http.sock'; # HTTP server Unix domain socket path
#######################################################################
# clear and create logging directory:
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 24bfdebe9..8cd30c5a5 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -1368,7 +1368,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
#endif /* ENABLE_IPV6 */
#ifdef USE_UNIX_SOCKETS
case AF_UNIX:
- logmsg("Proxying through UNIX socket is not (yet?) supported.");
+ logmsg("Proxying through Unix socket is not (yet?) supported.");
return CURL_SOCKET_BAD;
#endif /* USE_UNIX_SOCKETS */
}
@@ -2163,7 +2163,7 @@ int main(int argc, char *argv[])
goto sws_cleanup;
}
/* socket server is not alive, now check if it was actually a socket.
- * Systems which have UNIX sockets will also have lstat */
+ * Systems which have Unix sockets will also have lstat */
rc = lstat(unix_socket, &statbuf);
if (0 != rc) {
logmsg("Error binding socket, failed to stat %s: (%d) %s",
@@ -2208,7 +2208,7 @@ int main(int argc, char *argv[])
}
#ifdef USE_UNIX_SOCKETS
- /* listen succeeds, so let's assume a valid listening UNIX socket */
+ /* listen succeeds, so let's assume a valid listening Unix socket */
unlink_socket = true;
#endif
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 745efad3a..25557932f 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -1371,7 +1371,7 @@ abort:
/*
* Send a nak packet (error message). Error code passed in is one of the
- * standard TFTP codes, or a UNIX errno offset by 100.
+ * standard TFTP codes, or a Unix errno offset by 100.
*/
static void nak(int error)
{
View Lorry Controller Status