OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dr scofield's warning safari: hunting down those little buggers

0.6.0-stable
Dr Scofield 2008-06-27 16:18:56 +00:00
parent 92e04ea587
commit cea6e03ae0
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.XMPP
Text = message; Text = message;
} }
public string ToString() new public string ToString()
{ {
return Text; return Text;
} }

4
OpenSim/Framework/Servers/OSHttpRequest.cs
View File

@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers
private string _userAgent; private string _userAgent;
private HttpRequest _request; private HttpRequest _request;
private HttpClientContext _context; // private HttpClientContext _context;
public string[] AcceptTypes public string[] AcceptTypes
{ {
@ -175,7 +175,7 @@ namespace OpenSim.Framework.Servers
public OSHttpRequest(HttpClientContext context, HttpRequest req) public OSHttpRequest(HttpClientContext context, HttpRequest req)
{ {
_context = context; // _context = context;
_request = req; _request = req;
} }
} }

4
OpenSim/Framework/Servers/OSHttpRequestPump.cs
View File

@ -147,8 +147,6 @@ namespace OpenSim.Framework.Servers
Dictionary<string, Regex> headerRegexs = h.Headers; Dictionary<string, Regex> headerRegexs = h.Headers;
Regex endPointsRegex = h.IPEndPointWhitelist; Regex endPointsRegex = h.IPEndPointWhitelist;
int pathMatch = 0;
int headersMatch = 0;
// first, check whether IPEndPointWhitelist applies // first, check whether IPEndPointWhitelist applies
// and, if it does, whether client is on that white // and, if it does, whether client is on that white
@ -175,6 +173,8 @@ namespace OpenSim.Framework.Servers
// whitelist & path ok, now check headers // whitelist & path ok, now check headers
if (null != headerRegexs) if (null != headerRegexs)
{ {
int headersMatch = 0;
// go through all header Regexs and evaluate // go through all header Regexs and evaluate
// match: // match:
// if header field not present or does not match: // if header field not present or does not match:

3
OpenSim/Framework/Servers/RestObjectPoster.cs
View File

@ -69,7 +69,8 @@ namespace OpenSim.Framework.Servers
Stream requestStream = request.GetRequestStream(); Stream requestStream = request.GetRequestStream();
requestStream.Write(buffer.ToArray(), 0, length); 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) private static void AsyncCallback(IAsyncResult result)