Merge PR 'Curl improvements'

Curl versions older than 7.57.0 (found on Debian Stretch and older) do
not implicitly initialize openssl, which leads https requests to fail.

In the course of debugging this issue verbose curl requests were needed,
so that has also been added as a cvar.

https://github.com/DarkPlacesEngine/darkplaces/pull/36

commits: ceaa16c78a1f43165206566d4f9c872664f7e680
1a711173535d4b5f4364b66177745aab165330d8

Signed-off-by: bones_was_here <bones_was_here@xa.org.au>

diff --git a/netconn.c b/netconn.c
index 98d26019e0cc388918e0ded10da13bf22fc925f1..91c800b66d56d4e49d0d5359fa18031b4599b3cb 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -44,8 +44,9 @@ static cvar_t sv_masters [] =
        {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "sv_master2", "", "user-chosen master server 2"},
        {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "sv_master3", "", "user-chosen master server 3"},
        {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "sv_master4", "", "user-chosen master server 4"},
-       {CF_CLIENT | CF_SERVER, "sv_masterextra1", "dpmaster.deathmask.net", "dpmaster.deathmask.net - default master server 1 (admin: Willis)"}, // admin: Willis
-       {CF_CLIENT | CF_SERVER, "sv_masterextra2", "dpmaster.tchr.no", "dpmaster.tchr.no - default master server 2 (admin: tChr)"}, // admin: tChr
+       {CF_CLIENT | CF_SERVER, "sv_masterextra1", "dpmaster.deathmask.net", "dpmaster.deathmask.net - default master server 1 (admin: Willis)"},
+       {CF_CLIENT | CF_SERVER, "sv_masterextra2", "dpmaster.tchr.no", "dpmaster.tchr.no - default master server 2 (admin: tChr)"},
+       {CF_CLIENT | CF_SERVER, "sv_masterextra3", "dpm.dpmaster.org:27777", "dpm.dpmaster.org - default master server 3 (admin: gazby/soylent_cow)"},
        {0, NULL, NULL, NULL}
 };