aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/BaseHttpServer.cs
diff options
context:
space:
mode:
authorCharles Krinke2009-04-21 19:42:36 +0000
committerCharles Krinke2009-04-21 19:42:36 +0000
commit27c8cc5b1fc78bad6a8286f4236e4ac094b32e52 (patch)
tree36fecde27c8a877ba74952d2203eb10b92b46e35 /OpenSim/Framework/Servers/BaseHttpServer.cs
parent* extend user cache update test to check data backend (diff)
downloadopensim-SC_OLD-27c8cc5b1fc78bad6a8286f4236e4ac094b32e52.zip
opensim-SC_OLD-27c8cc5b1fc78bad6a8286f4236e4ac094b32e52.tar.gz
opensim-SC_OLD-27c8cc5b1fc78bad6a8286f4236e4ac094b32e52.tar.bz2
opensim-SC_OLD-27c8cc5b1fc78bad6a8286f4236e4ac094b32e52.tar.xz
Thank you kindly, TLaukkan for a patch that:
Added support for loading bare asset binaries (as opposed to xml encoded asset base) to both sandbox asset service and cable beach. * Added support for enabling region asset service when mxp is enabled. * Moved base http server content type defaulting before invocation of request handle method to allow for variable content type in the response.
Diffstat (limited to 'OpenSim/Framework/Servers/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index fc2d36a..121b8a8 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -303,6 +303,9 @@ namespace OpenSim.Framework.Servers
303 //m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler"); 303 //m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler");
304 // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. 304 // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
305 byte[] buffer; 305 byte[] buffer;
306
307 response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type.
308
306 if (requestHandler is IStreamedRequestHandler) 309 if (requestHandler is IStreamedRequestHandler)
307 { 310 {
308 IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler; 311 IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler;
@@ -371,7 +374,7 @@ namespace OpenSim.Framework.Servers
371 } 374 }
372 375
373 request.InputStream.Close(); 376 request.InputStream.Close();
374 response.ContentType = requestHandler.ContentType; 377
375 if (!response.SendChunked) 378 if (!response.SendChunked)
376 response.ContentLength64 = buffer.LongLength; 379 response.ContentLength64 = buffer.LongLength;
377 380
@@ -1620,4 +1623,4 @@ namespace OpenSim.Framework.Servers
1620 return; 1623 return;
1621 } 1624 }
1622 } 1625 }
1623} \ No newline at end of file 1626}