From cea6e03ae0aaea3acba6b844f173ee08259fe101 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 27 Jun 2008 16:18:56 +0000 Subject: dr scofield's warning safari: hunting down those little buggers --- OpenSim/Framework/Servers/OSHttpRequest.cs | 4 ++-- OpenSim/Framework/Servers/OSHttpRequestPump.cs | 4 ++-- OpenSim/Framework/Servers/RestObjectPoster.cs | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'OpenSim/Framework/Servers') diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs index 10614b2..1eb094e 100644 --- a/OpenSim/Framework/Servers/OSHttpRequest.cs +++ b/OpenSim/Framework/Servers/OSHttpRequest.cs @@ -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; } } diff --git a/OpenSim/Framework/Servers/OSHttpRequestPump.cs b/OpenSim/Framework/Servers/OSHttpRequestPump.cs index f04134c..3459cc6 100644 --- a/OpenSim/Framework/Servers/OSHttpRequestPump.cs +++ b/OpenSim/Framework/Servers/OSHttpRequestPump.cs @@ -147,8 +147,6 @@ namespace OpenSim.Framework.Servers Dictionary 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: diff --git a/OpenSim/Framework/Servers/RestObjectPoster.cs b/OpenSim/Framework/Servers/RestObjectPoster.cs index c77cb26..c449d01 100644 --- a/OpenSim/Framework/Servers/RestObjectPoster.cs +++ b/OpenSim/Framework/Servers/RestObjectPoster.cs @@ -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) -- cgit v1.1