summaryrefslogtreecommitdiff
path: root/test/httpserver/testfiles/httpserver.conf
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2018-02-20 21:50:22 -0500
committerReinhard Tartler <siretart@tauware.de>2018-02-20 21:50:22 -0500
commitf6d7cfd710de1bf9d4f6eabab45570bc91941ee1 (patch)
tree6aed4f8606e47c6ef21c5b1d8bbf7cafa694af6e /test/httpserver/testfiles/httpserver.conf
parentc81b92946b58b90fe9679a476338e2d2dec8df67 (diff)
parentf28f88e5e72ba1499409047a9d6985eb312c0232 (diff)
Merge branch 'upstream'
Diffstat (limited to 'test/httpserver/testfiles/httpserver.conf')
-rw-r--r--test/httpserver/testfiles/httpserver.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/httpserver/testfiles/httpserver.conf b/test/httpserver/testfiles/httpserver.conf
index 1a1c4644..d8c72a3f 100644
--- a/test/httpserver/testfiles/httpserver.conf
+++ b/test/httpserver/testfiles/httpserver.conf
@@ -1,5 +1,6 @@
-
-AddressPrefix = http://localhost:1080
+# Use 127.0.0.1 instead of localhost to force use of IPv4, as that is what the server
+# binds to. Windows tends to use IPv6 instead if possible, breaking the test.
+AddressPrefix = http://127.0.0.1:1080
Server
{