diff --git a/docs/tests/HTTP.md b/docs/tests/HTTP.md index 68fc8374bf..e28ea15da8 100644 --- a/docs/tests/HTTP.md +++ b/docs/tests/HTTP.md @@ -52,7 +52,7 @@ Via curl's `configure` script you may specify: * `--with-test-httpd=` if you have an Apache httpd installed somewhere else. On Debian/Ubuntu it will otherwise look into `/usr/bin` and `/usr/sbin` to find those. * `--with-test-caddy=` if you have a Caddy web server installed somewhere else. * `--with-test-vsftpd=` if you have a vsftpd ftp server installed somewhere else. - * `--with-test-sockd=` if you have dante sockd server installed + * `--with-test-sockd=` if you have `dante sockd` server installed ## Usage Tips diff --git a/lib/socks.c b/lib/socks.c index 4e5a04fd05..58132cb42d 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -181,6 +181,7 @@ static void socksstate(struct socks_state *sx, }; #endif + (void)cf; (void)data; if(oldstate == state) /* do not bother when the new state is the same as the old state */ diff --git a/tests/http/test_40_socks.py b/tests/http/test_40_socks.py index 9d747524d3..362e10c285 100644 --- a/tests/http/test_40_socks.py +++ b/tests/http/test_40_socks.py @@ -101,4 +101,3 @@ class TestSocks: for i in range(count): respdata = open(curl.response_file(i)).readlines() assert respdata == indata - diff --git a/tests/http/testenv/dante.py b/tests/http/testenv/dante.py index 773a94825b..ba2f61ac61 100644 --- a/tests/http/testenv/dante.py +++ b/tests/http/testenv/dante.py @@ -145,7 +145,7 @@ class Dante: 'socksmethod: none', 'client pass {', ' from: 127.0.0.0/24 to: 0.0.0.0/0', - ' log: error', + ' log: error', '}', 'socks pass {', ' from: 0.0.0.0/0 to: 0.0.0.0/0',