diff options
author | Dr Scofield | 2008-06-27 16:18:56 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 16:18:56 +0000 |
commit | cea6e03ae0aaea3acba6b844f173ee08259fe101 (patch) | |
tree | f27f0d01e445571f0cb4c4cf13adf975943b6a4d /OpenSim | |
parent | status: work-in-progress, non-functional (diff) | |
download | opensim-SC-cea6e03ae0aaea3acba6b844f173ee08259fe101.zip opensim-SC-cea6e03ae0aaea3acba6b844f173ee08259fe101.tar.gz opensim-SC-cea6e03ae0aaea3acba6b844f173ee08259fe101.tar.bz2 opensim-SC-cea6e03ae0aaea3acba6b844f173ee08259fe101.tar.xz |
dr scofield's warning safari: hunting down those little buggers
Diffstat (limited to '')
4 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs index b221459..fd4cd5f 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.XMPP | |||
60 | Text = message; | 60 | Text = message; |
61 | } | 61 | } |
62 | 62 | ||
63 | public string ToString() | 63 | new public string ToString() |
64 | { | 64 | { |
65 | return Text; | 65 | return Text; |
66 | } | 66 | } |
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 | |||
57 | private string _userAgent; | 57 | private string _userAgent; |
58 | 58 | ||
59 | private HttpRequest _request; | 59 | private HttpRequest _request; |
60 | private HttpClientContext _context; | 60 | // private HttpClientContext _context; |
61 | 61 | ||
62 | public string[] AcceptTypes | 62 | public string[] AcceptTypes |
63 | { | 63 | { |
@@ -175,7 +175,7 @@ namespace OpenSim.Framework.Servers | |||
175 | 175 | ||
176 | public OSHttpRequest(HttpClientContext context, HttpRequest req) | 176 | public OSHttpRequest(HttpClientContext context, HttpRequest req) |
177 | { | 177 | { |
178 | _context = context; | 178 | // _context = context; |
179 | _request = req; | 179 | _request = req; |
180 | } | 180 | } |
181 | } | 181 | } |
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 | |||
147 | Dictionary<string, Regex> headerRegexs = h.Headers; | 147 | Dictionary<string, Regex> headerRegexs = h.Headers; |
148 | Regex endPointsRegex = h.IPEndPointWhitelist; | 148 | Regex endPointsRegex = h.IPEndPointWhitelist; |
149 | 149 | ||
150 | int pathMatch = 0; | ||
151 | int headersMatch = 0; | ||
152 | 150 | ||
153 | // first, check whether IPEndPointWhitelist applies | 151 | // first, check whether IPEndPointWhitelist applies |
154 | // and, if it does, whether client is on that white | 152 | // and, if it does, whether client is on that white |
@@ -175,6 +173,8 @@ namespace OpenSim.Framework.Servers | |||
175 | // whitelist & path ok, now check headers | 173 | // whitelist & path ok, now check headers |
176 | if (null != headerRegexs) | 174 | if (null != headerRegexs) |
177 | { | 175 | { |
176 | int headersMatch = 0; | ||
177 | |||
178 | // go through all header Regexs and evaluate | 178 | // go through all header Regexs and evaluate |
179 | // match: | 179 | // match: |
180 | // if header field not present or does not match: | 180 | // 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 | |||
69 | 69 | ||
70 | Stream requestStream = request.GetRequestStream(); | 70 | Stream requestStream = request.GetRequestStream(); |
71 | requestStream.Write(buffer.ToArray(), 0, length); | 71 | requestStream.Write(buffer.ToArray(), 0, length); |
72 | IAsyncResult result = request.BeginGetResponse(AsyncCallback, request); | 72 | // IAsyncResult result = request.BeginGetResponse(AsyncCallback, request); |
73 | request.BeginGetResponse(AsyncCallback, request); | ||
73 | } | 74 | } |
74 | 75 | ||
75 | private static void AsyncCallback(IAsyncResult result) | 76 | private static void AsyncCallback(IAsyncResult result) |