diff options
author | Teravus Ovares | 2008-09-30 16:56:33 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-30 16:56:33 +0000 |
commit | 79b2e5ac71794dd4e55228e0ac146b527fb71ddf (patch) | |
tree | c84ebcaccff670125becc16c0da17d943bfdcecb /OpenSim/Framework/Servers/OSHttpResponse.cs | |
parent | more concierge stuff (diff) | |
download | opensim-SC_OLD-79b2e5ac71794dd4e55228e0ac146b527fb71ddf.zip opensim-SC_OLD-79b2e5ac71794dd4e55228e0ac146b527fb71ddf.tar.gz opensim-SC_OLD-79b2e5ac71794dd4e55228e0ac146b527fb71ddf.tar.bz2 opensim-SC_OLD-79b2e5ac71794dd4e55228e0ac146b527fb71ddf.tar.xz |
* Replacing Net.HttpListener with HttpServer.
* This is a HUGE update.. and should be considered fraut with peril.
* SSL Mode isn't available *yet* but I'll work on that next.
* DrScofld is still working on a radical new thread pump scheme for this which will be implemented soon.
* This could break the Build! This could break your Grid!
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/OSHttpResponse.cs | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs index f881a22..549ac27 100644 --- a/OpenSim/Framework/Servers/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/OSHttpResponse.cs | |||
@@ -200,19 +200,21 @@ namespace OpenSim.Framework.Servers | |||
200 | } | 200 | } |
201 | } | 201 | } |
202 | 202 | ||
203 | public Version ProtocolVersion | 203 | public string ProtocolVersion |
204 | { | 204 | { |
205 | get | 205 | get |
206 | { | 206 | { |
207 | if (!HttpServer) | 207 | if (HttpServer) |
208 | return _httpListenerResponse.ProtocolVersion; | 208 | return _httpResponse.ProtocolVersion; |
209 | 209 | else | |
210 | return new Version("1.0"); | 210 | return _httpListenerResponse.ProtocolVersion.ToString(); |
211 | } | 211 | } |
212 | set | 212 | set |
213 | { | 213 | { |
214 | if (!HttpServer) | 214 | if (HttpServer) |
215 | _httpListenerResponse.ProtocolVersion = value; | 215 | _httpResponse.ProtocolVersion = value; |
216 | else | ||
217 | _httpListenerResponse.ProtocolVersion = new Version(value); ; | ||
216 | 218 | ||
217 | } | 219 | } |
218 | } | 220 | } |
@@ -321,10 +323,10 @@ namespace OpenSim.Framework.Servers | |||
321 | private HttpResponse _httpResponse; | 323 | private HttpResponse _httpResponse; |
322 | private HttpListenerResponse _httpListenerResponse; | 324 | private HttpListenerResponse _httpListenerResponse; |
323 | 325 | ||
324 | // internal HttpResponse HttpResponse | 326 | internal HttpResponse HttpResponse |
325 | // { | 327 | { |
326 | // get { return _httpResponse; } | 328 | get { return _httpResponse; } |
327 | // } | 329 | } |
328 | 330 | ||
329 | public OSHttpResponse() | 331 | public OSHttpResponse() |
330 | { | 332 | { |
@@ -342,7 +344,10 @@ namespace OpenSim.Framework.Servers | |||
342 | { | 344 | { |
343 | _httpListenerResponse = resp; | 345 | _httpListenerResponse = resp; |
344 | } | 346 | } |
345 | 347 | public OSHttpResponse(HttpServer.HttpResponse resp) | |
348 | { | ||
349 | _httpResponse = resp; | ||
350 | } | ||
346 | /// <summary> | 351 | /// <summary> |
347 | /// Instantiate an OSHttpResponse object from an OSHttpRequest | 352 | /// Instantiate an OSHttpResponse object from an OSHttpRequest |
348 | /// object. | 353 | /// object. |
@@ -378,6 +383,7 @@ namespace OpenSim.Framework.Servers | |||
378 | { | 383 | { |
379 | _httpResponse.Body.Flush(); | 384 | _httpResponse.Body.Flush(); |
380 | _httpResponse.Send(); | 385 | _httpResponse.Send(); |
386 | |||
381 | } | 387 | } |
382 | else | 388 | else |
383 | { | 389 | { |