dr scofield's warning safari: hunting down those little buggers
parent
92e04ea587
commit
cea6e03ae0
|
@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.XMPP
|
|||
Text = message;
|
||||
}
|
||||
|
||||
public string ToString()
|
||||
new public string ToString()
|
||||
{
|
||||
return Text;
|
||||
}
|
||||
|
|
|
@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers
|
|||
private string _userAgent;
|
||||
|
||||
private HttpRequest _request;
|
||||
private HttpClientContext _context;
|
||||
// private HttpClientContext _context;
|
||||
|
||||
public string[] AcceptTypes
|
||||
{
|
||||
|
@ -175,7 +175,7 @@ namespace OpenSim.Framework.Servers
|
|||
|
||||
public OSHttpRequest(HttpClientContext context, HttpRequest req)
|
||||
{
|
||||
_context = context;
|
||||
// _context = context;
|
||||
_request = req;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -147,8 +147,6 @@ namespace OpenSim.Framework.Servers
|
|||
Dictionary<string, Regex> headerRegexs = h.Headers;
|
||||
Regex endPointsRegex = h.IPEndPointWhitelist;
|
||||
|
||||
int pathMatch = 0;
|
||||
int headersMatch = 0;
|
||||
|
||||
// first, check whether IPEndPointWhitelist applies
|
||||
// and, if it does, whether client is on that white
|
||||
|
@ -175,6 +173,8 @@ namespace OpenSim.Framework.Servers
|
|||
// whitelist & path ok, now check headers
|
||||
if (null != headerRegexs)
|
||||
{
|
||||
int headersMatch = 0;
|
||||
|
||||
// go through all header Regexs and evaluate
|
||||
// match:
|
||||
// if header field not present or does not match:
|
||||
|
|
|
@ -69,7 +69,8 @@ namespace OpenSim.Framework.Servers
|
|||
|
||||
Stream requestStream = request.GetRequestStream();
|
||||
requestStream.Write(buffer.ToArray(), 0, length);
|
||||
IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);
|
||||
// IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);
|
||||
request.BeginGetResponse(AsyncCallback, request);
|
||||
}
|
||||
|
||||
private static void AsyncCallback(IAsyncResult result)
|
||||
|
|
Loading…
Reference in New Issue