diff options
author | Dr Scofield | 2008-09-25 09:20:01 +0000 |
---|---|---|
committer | Dr Scofield | 2008-09-25 09:20:01 +0000 |
commit | 60618c1895f749ac68ade2f0d96c76eaebe9d20a (patch) | |
tree | 5a1a2c567cd5742c1cd7097b56f82f9b36b62c99 /OpenSim/Framework/Servers | |
parent | temporarily excluding OSHttp*.cs from prebuild.xml until they are (diff) | |
download | opensim-SC_OLD-60618c1895f749ac68ade2f0d96c76eaebe9d20a.zip opensim-SC_OLD-60618c1895f749ac68ade2f0d96c76eaebe9d20a.tar.gz opensim-SC_OLD-60618c1895f749ac68ade2f0d96c76eaebe9d20a.tar.bz2 opensim-SC_OLD-60618c1895f749ac68ade2f0d96c76eaebe9d20a.tar.xz |
temporarily disabling HttpServer related stuff (take #2: Exclude takes
regex not shell glob)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/OSHttpRequest.cs | 88 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/OSHttpResponse.cs | 8 |
2 files changed, 48 insertions, 48 deletions
diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs index 01e71c8..9c1053c 100644 --- a/OpenSim/Framework/Servers/OSHttpRequest.cs +++ b/OpenSim/Framework/Servers/OSHttpRequest.cs | |||
@@ -151,17 +151,17 @@ namespace OpenSim.Framework.Servers | |||
151 | } | 151 | } |
152 | private IPEndPoint _ipEndPoint; | 152 | private IPEndPoint _ipEndPoint; |
153 | 153 | ||
154 | internal HttpRequest HttpRequest | 154 | // internal HttpRequest HttpRequest |
155 | { | 155 | // { |
156 | get { return _request; } | 156 | // get { return _request; } |
157 | } | 157 | // } |
158 | private HttpRequest _request; | 158 | // private HttpRequest _request; |
159 | 159 | ||
160 | internal HttpClientContext HttpClientContext | 160 | // internal HttpClientContext HttpClientContext |
161 | { | 161 | // { |
162 | get { return _context; } | 162 | // get { return _context; } |
163 | } | 163 | // } |
164 | private HttpClientContext _context; | 164 | // private HttpClientContext _context; |
165 | 165 | ||
166 | /// <summary> | 166 | /// <summary> |
167 | /// Internal whiteboard for handlers to store temporary stuff | 167 | /// Internal whiteboard for handlers to store temporary stuff |
@@ -199,40 +199,40 @@ namespace OpenSim.Framework.Servers | |||
199 | // _isAuthenticated = req.IsAuthenticated; | 199 | // _isAuthenticated = req.IsAuthenticated; |
200 | } | 200 | } |
201 | 201 | ||
202 | public OSHttpRequest(HttpClientContext context, HttpRequest req) | 202 | // public OSHttpRequest(HttpClientContext context, HttpRequest req) |
203 | { | 203 | // { |
204 | _context = context; | 204 | // _context = context; |
205 | _request = req; | 205 | // _request = req; |
206 | 206 | ||
207 | _acceptTypes = req.AcceptTypes; | 207 | // _acceptTypes = req.AcceptTypes; |
208 | if (null != req.Headers["content-encoding"]) | 208 | // if (null != req.Headers["content-encoding"]) |
209 | _contentEncoding = Encoding.GetEncoding(_request.Headers["content-encoding"]); | 209 | // _contentEncoding = Encoding.GetEncoding(_request.Headers["content-encoding"]); |
210 | _contentLength64 = req.ContentLength; | 210 | // _contentLength64 = req.ContentLength; |
211 | if (null != req.Headers["content-type"]) | 211 | // if (null != req.Headers["content-type"]) |
212 | _contentType = _request.Headers["content-type"]; | 212 | // _contentType = _request.Headers["content-type"]; |
213 | _headers = req.Headers; | 213 | // _headers = req.Headers; |
214 | _httpMethod = req.Method; | 214 | // _httpMethod = req.Method; |
215 | _hasbody = req.ContentLength != 0; | 215 | // _hasbody = req.ContentLength != 0; |
216 | _inputStream = req.Body; | 216 | // _inputStream = req.Body; |
217 | _keepAlive = ConnectionType.KeepAlive == req.Connection; | 217 | // _keepAlive = ConnectionType.KeepAlive == req.Connection; |
218 | _rawUrl = req.Uri.AbsolutePath; | 218 | // _rawUrl = req.Uri.AbsolutePath; |
219 | _url = req.Uri; | 219 | // _url = req.Uri; |
220 | if (null != req.Headers["user-agent"]) | 220 | // if (null != req.Headers["user-agent"]) |
221 | _userAgent = req.Headers["user-agent"]; | 221 | // _userAgent = req.Headers["user-agent"]; |
222 | _queryString = new NameValueCollection(); | 222 | // _queryString = new NameValueCollection(); |
223 | _query = new Hashtable(); | 223 | // _query = new Hashtable(); |
224 | foreach (KeyValuePair<string, HttpInputItem> q in req.QueryString) | 224 | // foreach (KeyValuePair<string, HttpInputItem> q in req.QueryString) |
225 | { | 225 | // { |
226 | _queryString.Add(q.Key, q.Value.Value); | 226 | // _queryString.Add(q.Key, q.Value.Value); |
227 | _query[q.Key] = q.Value.Value; | 227 | // _query[q.Key] = q.Value.Value; |
228 | } | 228 | // } |
229 | // TODO: requires change to HttpServer.HttpRequest | 229 | // // TODO: requires change to HttpServer.HttpRequest |
230 | _ipEndPoint = null; | 230 | // _ipEndPoint = null; |
231 | 231 | ||
232 | // _cookies = req.Cookies; | 232 | // // _cookies = req.Cookies; |
233 | // _isSecureConnection = req.IsSecureConnection; | 233 | // // _isSecureConnection = req.IsSecureConnection; |
234 | // _isAuthenticated = req.IsAuthenticated; | 234 | // // _isAuthenticated = req.IsAuthenticated; |
235 | } | 235 | // } |
236 | 236 | ||
237 | public override string ToString() | 237 | public override string ToString() |
238 | { | 238 | { |
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs index 21d1e2b..6fff026 100644 --- a/OpenSim/Framework/Servers/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/OSHttpResponse.cs | |||
@@ -332,10 +332,10 @@ namespace OpenSim.Framework.Servers | |||
332 | /// </summary | 332 | /// </summary |
333 | /// <param name="req">Incoming OSHttpRequest to which we are | 333 | /// <param name="req">Incoming OSHttpRequest to which we are |
334 | /// replying</param> | 334 | /// replying</param> |
335 | public OSHttpResponse(OSHttpRequest req) | 335 | // public OSHttpResponse(OSHttpRequest req) |
336 | { | 336 | // { |
337 | _httpResponse = new HttpResponse(req.HttpClientContext, req.HttpRequest); | 337 | // _httpResponse = new HttpResponse(req.HttpClientContext, req.HttpRequest); |
338 | } | 338 | // } |
339 | 339 | ||
340 | /// <summary> | 340 | /// <summary> |
341 | /// Add a header field and content to the response. | 341 | /// Add a header field and content to the response. |