epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small tweak to HttpUtil - we don't support 1.1, so dont pretend we do; also, set WebClient.Proxy everywhere to null

Browse Source
This commit is contained in:
Chris Forbes
2011-01-04 20:02:23 +13:00
parent fe720186f5
commit dcbb6ee4eb
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.FileFormats/HttpUtil.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.FileFormats
var ns = s.GetStream(); var ns = s.GetStream();
var sw = new StreamWriter(ns); var sw = new StreamWriter(ns);
sw.Write("GET {0} HTTP/1.1\r\nHost:{1}\r\n\r\n", uri.PathAndQuery, uri.Host); sw.Write("GET {0} HTTP/1.0\r\nHost:{1}\r\n\r\n", uri.PathAndQuery, uri.Host);
sw.Flush(); sw.Flush();
var br = new BinaryReader(ns); var br = new BinaryReader(ns);

1
OpenRA.Game/Server/MasterServerQuery.cs
View File

@@ -62,6 +62,7 @@ namespace OpenRA.Server
static string GetData(Uri uri) static string GetData(Uri uri)
{ {
var wc = new WebClient(); var wc = new WebClient();
wc.Proxy = null;
var data = wc.DownloadData(uri); var data = wc.DownloadData(uri);
return Encoding.UTF8.GetString(data); return Encoding.UTF8.GetString(data);
} }

7
OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs
View File

@@ -61,6 +61,7 @@ namespace OpenRA.Mods.RA.Server
using (var wc = new WebClient()) using (var wc = new WebClient())
{ {
wc.Proxy = null;
wc.DownloadData( wc.DownloadData(
masterServerUrl + url.F( masterServerUrl + url.F(
externalPort, Uri.EscapeUriString(server.Name), externalPort, Uri.EscapeUriString(server.Name),
@@ -77,11 +78,11 @@ namespace OpenRA.Mods.RA.Server
} }
} }
} }
catch(Exception ex) catch (Exception ex)
{ {
Log.Write("server", ex.ToString()); Log.Write("server", ex.ToString());
lock( masterServerMessages ) lock (masterServerMessages)
masterServerMessages.Enqueue( "Master server communication failed." ); masterServerMessages.Enqueue("Master server communication failed.");
} }
isBusy = false; isBusy = false;

2
OpenRA.Utility/Command.cs
View File

@@ -118,11 +118,11 @@ namespace OpenRA.Utility
string[] args = argValue.Split(','); string[] args = argValue.Split(',');
string url = args[0]; string url = args[0];
WebClient wc = new WebClient(); WebClient wc = new WebClient();
wc.Proxy = null;
if (args.Length == 1) if (args.Length == 1)
{ {
wc.DownloadStringCompleted += DownloadStringCompleted; wc.DownloadStringCompleted += DownloadStringCompleted;
wc.DownloadStringAsync(new Uri(url)); wc.DownloadStringAsync(new Uri(url));
} }
else if (args.Length == 2) else if (args.Length == 2)