From 3fef242a1e1a74140a1678d84164086d0f47d83a Mon Sep 17 00:00:00 2001

From: Peter Wu <peter@lekensteyn.nl>

Date: Thu, 27 Nov 2014 23:59:19 +0100

Subject: [PATCH 01/11] sws: move away from IPv4/IPv4-only assumption

Instead of depending the socket domain type on use_ipv6, specify the

domain type (AF_INET / AF_INET6) as variable. An enum is used here with

switch to avoid compiler warnings in connect_to, complaining that rc

is possibly undefined (which is not possible as socket_domain is

always set).

Besides abstracting the socket type, make the debugging messages be

independent on IP (introduce location_str which points to "port XXXXX").

Rename "ipv_inuse" to "socket_type" and tighten the scope (main).

Signed-off-by: Peter Wu <peter@lekensteyn.nl>

Upstream-commit: cf6c5c222d86088cbfc9dee4c23f8ada96ee91e7

Signed-off-by: Kamil Dudka <kdudka@redhat.com>

---

 tests/server/sws.c | 88 ++++++++++++++++++++++++------------------------------

 1 file changed, 39 insertions(+), 49 deletions(-)

diff --git a/tests/server/sws.c b/tests/server/sws.c

index aef55ea..fa10d54 100644

--- a/tests/server/sws.c

+++ b/tests/server/sws.c

@@ -65,11 +65,13 @@

 #define ERANGE  34 /* errno.h value */

 #endif

+static enum {

+  socket_domain_inet = AF_INET,

 #ifdef ENABLE_IPV6

-static bool use_ipv6 = FALSE;

+  socket_domain_inet6 = AF_INET6

 #endif

+} socket_domain = AF_INET;

 static bool use_gopher = FALSE;

-static const char *ipv_inuse = "IPv4";

 static int serverlogslocked = 0;

 static bool is_proxy = FALSE;

@@ -1285,7 +1287,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

 #endif

 #ifdef ENABLE_IPV6

-  if(use_ipv6) {

+  if(socket_domain == AF_INET6) {

     op_br = "[";

     cl_br = "]";

   }

@@ -1297,14 +1299,8 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

   logmsg("about to connect to %s%s%s:%hu",

          op_br, ipaddr, cl_br, port);

-#ifdef ENABLE_IPV6

-  if(!use_ipv6)

-#endif

-    serverfd = socket(AF_INET, SOCK_STREAM, 0);

-#ifdef ENABLE_IPV6

-  else

-    serverfd = socket(AF_INET6, SOCK_STREAM, 0);

-#endif

+

+  serverfd = socket(socket_domain, SOCK_STREAM, 0);

   if(CURL_SOCKET_BAD == serverfd) {

     error = SOCKERRNO;

     logmsg("Error creating socket for server conection: (%d) %s",

@@ -1322,9 +1318,8 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

     logmsg("TCP_NODELAY set for server conection");

 #endif

-#ifdef ENABLE_IPV6

-  if(!use_ipv6) {

-#endif

+  switch(socket_domain) {

+  case AF_INET:

     memset(&serveraddr.sa4, 0, sizeof(serveraddr.sa4));

     serveraddr.sa4.sin_family = AF_INET;

     serveraddr.sa4.sin_port = htons(port);

@@ -1335,9 +1330,9 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

     }

     rc = connect(serverfd, &serveraddr.sa, sizeof(serveraddr.sa4));

+    break;

 #ifdef ENABLE_IPV6

-  }

-  else {

+  case AF_INET6:

     memset(&serveraddr.sa6, 0, sizeof(serveraddr.sa6));

     serveraddr.sa6.sin6_family = AF_INET6;

     serveraddr.sa6.sin6_port = htons(port);

@@ -1348,8 +1343,9 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

     }

     rc = connect(serverfd, &serveraddr.sa, sizeof(serveraddr.sa6));

-  }

+    break;

 #endif /* ENABLE_IPV6 */

+  }

   if(got_exit_signal) {

     sclose(serverfd);

@@ -1924,21 +1920,20 @@ int main(int argc, char *argv[])

   int arg=1;

   long pid;

   const char *hostport = "127.0.0.1";

+  const char *socket_type = "IPv4";

+  char port_str[11];

+  const char *location_str = port_str;

   size_t socket_idx;

   memset(&req, 0, sizeof(req));

   while(argc>arg) {

     if(!strcmp("--version", argv[arg])) {

-      printf("sws IPv4%s"

-             "\n"

-             ,

+      puts("sws IPv4"

 #ifdef ENABLE_IPV6

              "/IPv6"

-#else

-             ""

 #endif

-             );

+          );

       return 0;

     }

     else if(!strcmp("--pidfile", argv[arg])) {

@@ -1957,16 +1952,16 @@ int main(int argc, char *argv[])

       end_of_headers = "\r\n"; /* gopher style is much simpler */

     }

     else if(!strcmp("--ipv4", argv[arg])) {

-#ifdef ENABLE_IPV6

-      ipv_inuse = "IPv4";

-      use_ipv6 = FALSE;

-#endif

+      socket_type = "IPv4";

+      socket_domain = AF_INET;

+      location_str = port_str;

       arg++;

     }

     else if(!strcmp("--ipv6", argv[arg])) {

 #ifdef ENABLE_IPV6

-      ipv_inuse = "IPv6";

-      use_ipv6 = TRUE;

+      socket_type = "IPv6";

+      socket_domain = AF_INET6;

+      location_str = port_str;

 #endif

       arg++;

     }

@@ -2018,6 +2013,8 @@ int main(int argc, char *argv[])

     }

   }

+  snprintf(port_str, sizeof(port_str), "port %hu", port);

+

 #ifdef WIN32

   win32_init();

   atexit(win32_cleanup);

@@ -2027,14 +2024,7 @@ int main(int argc, char *argv[])

   pid = (long)getpid();

-#ifdef ENABLE_IPV6

-  if(!use_ipv6)

-#endif

-    sock = socket(AF_INET, SOCK_STREAM, 0);

-#ifdef ENABLE_IPV6

-  else

-    sock = socket(AF_INET6, SOCK_STREAM, 0);

-#endif

+  sock = socket(socket_domain, SOCK_STREAM, 0);

   all_sockets[0] = sock;

   num_sockets = 1;

@@ -2061,33 +2051,33 @@ int main(int argc, char *argv[])

     goto sws_cleanup;

   }

-#ifdef ENABLE_IPV6

-  if(!use_ipv6) {

-#endif

+  switch(socket_domain) {

+  case AF_INET:

     memset(&me.sa4, 0, sizeof(me.sa4));

     me.sa4.sin_family = AF_INET;

     me.sa4.sin_addr.s_addr = INADDR_ANY;

     me.sa4.sin_port = htons(port);

     rc = bind(sock, &me.sa, sizeof(me.sa4));

+    break;

 #ifdef ENABLE_IPV6

-  }

-  else {

+  case AF_INET6:

     memset(&me.sa6, 0, sizeof(me.sa6));

     me.sa6.sin6_family = AF_INET6;

     me.sa6.sin6_addr = in6addr_any;

     me.sa6.sin6_port = htons(port);

     rc = bind(sock, &me.sa, sizeof(me.sa6));

-  }

+    break;

 #endif /* ENABLE_IPV6 */

+  }

   if(0 != rc) {

     error = SOCKERRNO;

-    logmsg("Error binding socket on port %hu: (%d) %s",

-           port, error, strerror(error));

+    logmsg("Error binding socket on %s: (%d) %s",

+           location_str, error, strerror(error));

     goto sws_cleanup;

   }

-  logmsg("Running %s %s version on port %d",

-         use_gopher?"GOPHER":"HTTP", ipv_inuse, (int)port);

+  logmsg("Running %s %s version on %s",

+         use_gopher?"GOPHER":"HTTP", socket_type, location_str);

   /* start accepting connections */

   rc = listen(sock, 5);

@@ -2251,8 +2241,8 @@ sws_cleanup:

   restore_signal_handlers();

   if(got_exit_signal) {

-    logmsg("========> %s sws (port: %d pid: %ld) exits with signal (%d)",

-           ipv_inuse, (int)port, pid, exit_signal);

+    logmsg("========> %s sws (%s pid: %ld) exits with signal (%d)",

+           socket_type, location_str, pid, exit_signal);

     /*

      * To properly set the return status of the process we

      * must raise the same signal SIGINT or SIGTERM that we

-- 

2.5.2

From d8d875f7c528157feec0795c03bd065420903f5d Mon Sep 17 00:00:00 2001

From: Steve Holme <steve_holme@hotmail.com>

Date: Wed, 3 Dec 2014 00:00:40 +0000

Subject: [PATCH 02/11] sws.c: Fixed compilation warning when IPv6 is disabled

sws.c:69: warning: comma at end of enumerator list

Upstream-commit: d784000a1468efc986c7d156d2e7c84d1920af87

Signed-off-by: Kamil Dudka <kdudka@redhat.com>

---

 tests/server/sws.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/server/sws.c b/tests/server/sws.c

index fa10d54..2b7e628 100644

--- a/tests/server/sws.c

+++ b/tests/server/sws.c

@@ -66,9 +66,9 @@

 #endif

 static enum {

-  socket_domain_inet = AF_INET,

+  socket_domain_inet = AF_INET

 #ifdef ENABLE_IPV6

-  socket_domain_inet6 = AF_INET6

+  , socket_domain_inet6 = AF_INET6

 #endif

 } socket_domain = AF_INET;

 static bool use_gopher = FALSE;

-- 

2.5.2

From db2095dec37630309bacca6795cd4cfcf6557c9b Mon Sep 17 00:00:00 2001

From: Peter Wu <peter@lekensteyn.nl>

Date: Thu, 27 Nov 2014 23:59:20 +0100

Subject: [PATCH 03/11] sws: restrict TCP_NODELAY to IP sockets

TCP_NODELAY does not make sense for Unix sockets, so enable it only if

the socket is using IP.

Signed-off-by: Peter Wu <peter@lekensteyn.nl>

Upstream-commit: fb7d7e0022f22035449bbc506068004f0568f8ae

Signed-off-by: Kamil Dudka <kdudka@redhat.com>

---

 tests/server/sws.c | 73 ++++++++++++++++++++++++++++++++----------------------

 1 file changed, 44 insertions(+), 29 deletions(-)

diff --git a/tests/server/sws.c b/tests/server/sws.c

index 2b7e628..0739a70 100644

--- a/tests/server/sws.c

+++ b/tests/server/sws.c

@@ -331,6 +331,21 @@ static void restore_signal_handlers(void)

 #endif

 }

+/* returns true if the current socket is an IP one */

+static bool socket_domain_is_ip(void)

+{

+  switch(socket_domain) {

+  case AF_INET:

+#ifdef ENABLE_IPV6

+  case AF_INET6:

+#endif

+    return true;

+  default:

+  /* case AF_UNIX: */

+    return false;

+  }

+}

+

 /* based on the testno, parse the correct server commands */

 static int parse_servercmd(struct httprequest *req)

 {

@@ -1282,9 +1297,6 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

   int rc;

   const char *op_br = "";

   const char *cl_br = "";

-#ifdef TCP_NODELAY

-  curl_socklen_t flag;

-#endif

 #ifdef ENABLE_IPV6

   if(socket_domain == AF_INET6) {

@@ -1309,13 +1321,15 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

   }

 #ifdef TCP_NODELAY

-  /* Disable the Nagle algorithm */

-  flag = 1;

-  if(0 != setsockopt(serverfd, IPPROTO_TCP, TCP_NODELAY,

-                     (void *)&flag, sizeof(flag)))

-    logmsg("====> TCP_NODELAY for server conection failed");

-  else

-    logmsg("TCP_NODELAY set for server conection");

+  if(socket_domain_is_ip()) {

+    /* Disable the Nagle algorithm */

+    curl_socklen_t flag = 1;

+    if(0 != setsockopt(serverfd, IPPROTO_TCP, TCP_NODELAY,

+                       (void *)&flag, sizeof(flag)))

+      logmsg("====> TCP_NODELAY for server conection failed");

+    else

+      logmsg("TCP_NODELAY set for server conection");

+  }

 #endif

   switch(socket_domain) {

@@ -1398,9 +1412,6 @@ static void http_connect(curl_socket_t *infdp,

   bool poll_server_rd[2] = { TRUE, TRUE };

   bool poll_client_wr[2] = { TRUE, TRUE };

   bool poll_server_wr[2] = { TRUE, TRUE };

-#ifdef TCP_NODELAY

-  curl_socklen_t flag;

-#endif

   bool primary = FALSE;

   bool secondary = FALSE;

   int max_tunnel_idx; /* CTRL or DATA */

@@ -1514,13 +1525,15 @@ static void http_connect(curl_socket_t *infdp,

           memset(&req2, 0, sizeof(req2));

           logmsg("====> Client connect DATA");

 #ifdef TCP_NODELAY

-          /* Disable the Nagle algorithm */

-          flag = 1;

-          if(0 != setsockopt(datafd, IPPROTO_TCP, TCP_NODELAY,

-                             (void *)&flag, sizeof(flag)))

-            logmsg("====> TCP_NODELAY for client DATA conection failed");

-          else

-            logmsg("TCP_NODELAY set for client DATA conection");

+          if(socket_domain_is_ip()) {

+            /* Disable the Nagle algorithm */

+            curl_socklen_t flag = 1;

+            if(0 != setsockopt(datafd, IPPROTO_TCP, TCP_NODELAY,

+                               (void *)&flag, sizeof(flag)))

+              logmsg("====> TCP_NODELAY for client DATA conection failed");

+            else

+              logmsg("TCP_NODELAY set for client DATA conection");

+          }

 #endif

           req2.pipelining = FALSE;

           init_httprequest(&req2);

@@ -1826,15 +1839,17 @@ static curl_socket_t accept_connection(curl_socket_t sock)

   num_sockets += 1;

 #ifdef TCP_NODELAY

-  /*

-   * Disable the Nagle algorithm to make it easier to send out a large

-   * response in many small segments to torture the clients more.

-   */

-  if(0 != setsockopt(msgsock, IPPROTO_TCP, TCP_NODELAY,

-                     (void *)&flag, sizeof(flag)))

-    logmsg("====> TCP_NODELAY failed");

-  else

-    logmsg("TCP_NODELAY set");

+  if(socket_domain_is_ip()) {

+    /*

+     * Disable the Nagle algorithm to make it easier to send out a large

+     * response in many small segments to torture the clients more.

+     */

+    if(0 != setsockopt(msgsock, IPPROTO_TCP, TCP_NODELAY,

+                       (void *)&flag, sizeof(flag)))

+      logmsg("====> TCP_NODELAY failed");

+    else

+      logmsg("TCP_NODELAY set");

+  }

 #endif

   return msgsock;

-- 

2.5.2

From 7ab987459a931e593dc9f533d6e6cb6e9a26d424 Mon Sep 17 00:00:00 2001

From: Peter Wu <peter@lekensteyn.nl>

Date: Wed, 3 Dec 2014 02:20:00 +0100

Subject: [PATCH 04/11] sws: add UNIX domain socket support

This extends sws with a --unix-socket option which causes the port to

be ignored (as the server now listens on the path specified by

--unix-socket). This feature will be available in the following patch

that enables checking for UNIX domain socket support.

Proxy support (CONNECT) is not considered nor tested. It does not make

sense anyway, first connecting through a TCP proxy, then let that TCP

proxy connect to a UNIX socket.

Signed-off-by: Peter Wu <peter@lekensteyn.nl>

Upstream-commit: e9c7a86220ddf4e67b8bff56cddfc7388afcc9ef

Signed-off-by: Kamil Dudka <kdudka@redhat.com>

---

 tests/server/server_sockaddr.h |  9 ++++++-

 tests/server/sws.c             | 53 ++++++++++++++++++++++++++++++++++++++++++

 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/tests/server/server_sockaddr.h b/tests/server/server_sockaddr.h

index 6a17fe0..3f4cd67 100644

--- a/tests/server/server_sockaddr.h

+++ b/tests/server/server_sockaddr.h

@@ -7,7 +7,7 @@

  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

@@ -23,12 +23,19 @@

  ***************************************************************************/

 #include "server_setup.h"

+#ifdef HAVE_SYS_UN_H

+#include <sys/un.h> /* for sockaddr_un */

+#endif

+

 typedef union {

   struct sockaddr      sa;

   struct sockaddr_in   sa4;

 #ifdef ENABLE_IPV6

   struct sockaddr_in6  sa6;

 #endif

+#ifdef USE_UNIX_SOCKETS

+  struct sockaddr_un   sau;

+#endif

 } srvr_sockaddr_union_t;

 #endif /* HEADER_CURL_SERVER_SOCKADDR_H */

diff --git a/tests/server/sws.c b/tests/server/sws.c

index 0739a70..24ecb8f 100644

--- a/tests/server/sws.c

+++ b/tests/server/sws.c

@@ -70,6 +70,9 @@ static enum {

 #ifdef ENABLE_IPV6

   , socket_domain_inet6 = AF_INET6

 #endif

+#ifdef USE_UNIX_SOCKETS

+  , socket_domain_unix = AF_UNIX

+#endif

 } socket_domain = AF_INET;

 static bool use_gopher = FALSE;

 static int serverlogslocked = 0;

@@ -1359,6 +1362,11 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

     rc = connect(serverfd, &serveraddr.sa, sizeof(serveraddr.sa6));

     break;

 #endif /* ENABLE_IPV6 */

+#ifdef USE_UNIX_SOCKETS

+  case AF_UNIX:

+    logmsg("Proxying through UNIX socket is not (yet?) supported.");

+    return CURL_SOCKET_BAD;

+#endif /* USE_UNIX_SOCKETS */

   }

   if(got_exit_signal) {

@@ -1928,6 +1936,10 @@ int main(int argc, char *argv[])

   int wrotepidfile = 0;

   int flag;

   unsigned short port = DEFAULT_PORT;

+#ifdef USE_UNIX_SOCKETS

+  const char *unix_socket = NULL;

+  bool unlink_socket = false;

+#endif

   char *pidname= (char *)".http.pid";

   struct httprequest req;

   int rc;

@@ -1948,6 +1960,9 @@ int main(int argc, char *argv[])

 #ifdef ENABLE_IPV6

              "/IPv6"

 #endif

+#ifdef USE_UNIX_SOCKETS

+             "/unix"

+#endif

           );

       return 0;

     }

@@ -1980,6 +1995,23 @@ int main(int argc, char *argv[])

 #endif

       arg++;

     }

+    else if(!strcmp("--unix-socket", argv[arg])) {

+      arg++;

+      if(argc>arg) {

+#ifdef USE_UNIX_SOCKETS

+        unix_socket = argv[arg];

+        if(strlen(unix_socket) >= sizeof(me.sau.sun_path)) {

+          fprintf(stderr, "sws: socket path must be shorter than %zu chars\n",

+                  sizeof(me.sau.sun_path));

+          return 0;

+        }

+        socket_type = "unix";

+        socket_domain = AF_UNIX;

+        location_str = unix_socket;

+#endif

+        arg++;

+      }

+    }

     else if(!strcmp("--port", argv[arg])) {

       arg++;

       if(argc>arg) {

@@ -2020,6 +2052,7 @@ int main(int argc, char *argv[])

            " --pidfile [file]\n"

            " --ipv4\n"

            " --ipv6\n"

+           " --unix-socket [file]\n"

            " --port [port]\n"

            " --srcdir [path]\n"

            " --connect [ip4-addr]\n"

@@ -2083,6 +2116,14 @@ int main(int argc, char *argv[])

     rc = bind(sock, &me.sa, sizeof(me.sa6));

     break;

 #endif /* ENABLE_IPV6 */

+#ifdef USE_UNIX_SOCKETS

+  case AF_UNIX:

+    memset(&me.sau, 0, sizeof(me.sau));

+    me.sau.sun_family = AF_UNIX;

+    strncpy(me.sau.sun_path, unix_socket, sizeof(me.sau.sun_path));

+    rc = bind(sock, &me.sa, sizeof(me.sau));

+    break;

+#endif /* USE_UNIX_SOCKETS */

   }

   if(0 != rc) {

     error = SOCKERRNO;

@@ -2103,6 +2144,11 @@ int main(int argc, char *argv[])

     goto sws_cleanup;

   }

+#ifdef USE_UNIX_SOCKETS

+  /* listen succeeds, so let's assume a valid listening UNIX socket */

+  unlink_socket = true;

+#endif

+

   /*

   ** As soon as this server writes its pid file the test harness will

   ** attempt to connect to this server and initiate its verification.

@@ -2242,6 +2288,13 @@ sws_cleanup:

   if(sock != CURL_SOCKET_BAD)

     sclose(sock);

+#ifdef USE_UNIX_SOCKETS

+  if(unlink_socket && socket_domain == AF_UNIX) {

+    rc = unlink(unix_socket);

+    logmsg("unlink(%s) = %d (%s)", unix_socket, rc, strerror(rc));

+  }

+#endif

+

   if(got_exit_signal)

     logmsg("signalled to die");

-- 

2.5.2

From d04ea6f7f09e1556f80c4bbf4fc9497f83bc37a6 Mon Sep 17 00:00:00 2001

From: Peter Wu <peter@lekensteyn.nl>

Date: Thu, 27 Nov 2014 23:59:23 +0100

Subject: [PATCH 05/11] tests: add HTTP UNIX socket server testing support

The variable `$ipvnum` can now contain "unix" besides the integers 4

and 6 since the variable. Functions which receive this parameter

have their `$port` parameter renamed to `$port_or_path` to support a

path to the UNIX domain socket (as a "port" is only meaningful for TCP).

Signed-off-by: Peter Wu <peter@lekensteyn.nl>

Upstream-commit: f1cc2a2c0cf8e191e606c6093c679fbee95e8809

Signed-off-by: Kamil Dudka <kdudka@redhat.com>

---

 tests/FILEFORMAT    |  2 ++

 tests/README        |  3 ++

 tests/httpserver.pl | 15 ++++++++-

 tests/runtests.pl   | 96 +++++++++++++++++++++++++++++++++++++++++++++--------

 tests/serverhelp.pm |  4 +--

 5 files changed, 104 insertions(+), 16 deletions(-)

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT

index 96cd5c8..702368f 100644

--- a/tests/FILEFORMAT

+++ b/tests/FILEFORMAT

@@ -165,6 +165,7 @@ smtp

 httptls+srp

 httptls+srp-ipv6

 http-proxy

+http-unix

 Give only one per line.  This subsection is mandatory.

 </server>

@@ -284,6 +285,7 @@ Available substitute variables include:

 %HTTPPORT  - Port number of the HTTP server

 %HOST6IP   - IPv6 address of the host running this test

 %HTTP6PORT - IPv6 port number of the HTTP server

+%HTTPUNIXPATH - Path to the UNIX socket of the HTTP server

 %HTTPSPORT - Port number of the HTTPS server

 %PROXYPORT - Port number of the HTTP proxy

 %FTPPORT   - Port number of the FTP server

diff --git a/tests/README b/tests/README

index fff618e..b442693 100644

--- a/tests/README

+++ b/tests/README

@@ -80,6 +80,9 @@ 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

+  location is 'http.sock'.

+

  1.4 Run

   'make test'. This builds the test suite support code and invokes the

diff --git a/tests/httpserver.pl b/tests/httpserver.pl

index a38c3ce..1b8c3d2 100755

--- a/tests/httpserver.pl

+++ b/tests/httpserver.pl

@@ -36,6 +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 $ipvnum = 4;      # default IP version of http server

 my $idnum = 1;       # dafault http server instance number

 my $proto = 'http';  # protocol the http server speaks

@@ -74,6 +75,13 @@ while(@ARGV) {

     elsif($ARGV[0] eq '--ipv6') {

         $ipvnum = 6;

     }

+    elsif($ARGV[0] eq '--unix-socket') {

+        $ipvnum = 'unix';

+        if($ARGV[1]) {

+            $unix_socket = $ARGV[1];

+            shift @ARGV;

+        }

+    }

     elsif($ARGV[0] eq '--gopher') {

         $gopher = 1;

     }

@@ -117,7 +125,12 @@ if(!$logfile) {

 $flags .= "--pidfile \"$pidfile\" --logfile \"$logfile\" ";

 $flags .= "--gopher " if($gopher);

 $flags .= "--connect $connect " if($connect);

-$flags .= "--ipv$ipvnum --port $port --srcdir \"$srcdir\"";

+if($ipvnum eq 'unix') {

+    $flags .= "--unix-socket '$unix_socket' ";

+} else {

+    $flags .= "--ipv$ipvnum --port $port ";

+}

+$flags .= "--srcdir \"$srcdir\"";

 if($verbose) {

     print STDERR "RUN: server/sws $flags\n";

diff --git a/tests/runtests.pl b/tests/runtests.pl

index b39da66..fa96345 100755

--- a/tests/runtests.pl

+++ b/tests/runtests.pl

@@ -140,6 +140,7 @@ my $GOPHER6PORT;         # Gopher IPv6 server port

 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 $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

@@ -201,10 +202,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 $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_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

@@ -358,6 +361,13 @@ sub init_serverpidfile_hash {

       }

     }

   }

+  for my $proto (('http', 'imap', 'pop3', 'smtp')) {

+    for my $ssl (('', 's')) {

+      my $serv = servername_id("$proto$ssl", "unix", 1);

+      my $pidf = server_pidfilename("$proto$ssl", "unix", 1);