aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-29 23:13:08 +0000
committerMelanie Thielker2009-07-29 23:13:08 +0000
commit07579fa402e46873aed8b59a71644dbe25ccc8bc (patch)
tree922766e7cdbb63dd4ac96a5189ecf483137e5af2 /OpenSim
parent* An attempt to fix mantis #3955 (diff)
downloadopensim-SC-07579fa402e46873aed8b59a71644dbe25ccc8bc.zip
opensim-SC-07579fa402e46873aed8b59a71644dbe25ccc8bc.tar.gz
opensim-SC-07579fa402e46873aed8b59a71644dbe25ccc8bc.tar.bz2
opensim-SC-07579fa402e46873aed8b59a71644dbe25ccc8bc.tar.xz
Add basic support ofr detached request handling to the HTTP server.
Groundwork to finish HTTP IN.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index f7a2044..d268457 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -355,7 +355,7 @@ namespace OpenSim.Framework.Servers.HttpServer
355 { 355 {
356 //m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler"); 356 //m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler");
357 // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. 357 // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
358 byte[] buffer; 358 byte[] buffer = null;
359 359
360 response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type. 360 response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type.
361 361
@@ -428,6 +428,12 @@ namespace OpenSim.Framework.Servers.HttpServer
428 428
429 request.InputStream.Close(); 429 request.InputStream.Close();
430 430
431 // HTTP IN support. The script engine taes it from here
432 // Nothing to worry about for us.
433 //
434 if (buffer == null)
435 return;
436
431 if (!response.SendChunked) 437 if (!response.SendChunked)
432 response.ContentLength64 = buffer.LongLength; 438 response.ContentLength64 = buffer.LongLength;
433 439