aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorTeravus Ovares2009-07-29 20:32:54 +0000
committerTeravus Ovares2009-07-29 20:32:54 +0000
commitf727f26bcc26a740a1bd0585e3cdeff0c8d81a25 (patch)
tree6131b08c94b65a9fea773a1853d382d85377b523 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentThank you, coyled, for a patch to change Flotsamcache path generation (diff)
downloadopensim-SC_OLD-f727f26bcc26a740a1bd0585e3cdeff0c8d81a25.zip
opensim-SC_OLD-f727f26bcc26a740a1bd0585e3cdeff0c8d81a25.tar.gz
opensim-SC_OLD-f727f26bcc26a740a1bd0585e3cdeff0c8d81a25.tar.bz2
opensim-SC_OLD-f727f26bcc26a740a1bd0585e3cdeff0c8d81a25.tar.xz
* An attempt to fix mantis #3953
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 369d7d4..f2a1da0 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -274,7 +274,7 @@ namespace OpenSim.Framework.Servers.HttpServer
274 public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request) 274 public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request)
275 { 275 {
276 OSHttpRequest req = new OSHttpRequest(context, request); 276 OSHttpRequest req = new OSHttpRequest(context, request);
277 OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request)); 277 OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
278 //resp.KeepAlive = req.KeepAlive; 278 //resp.KeepAlive = req.KeepAlive;
279 //m_log.Info("[Debug BASE HTTP SERVER]: Got Request"); 279 //m_log.Info("[Debug BASE HTTP SERVER]: Got Request");
280 //HttpServerContextObj objstate= new HttpServerContextObj(req,resp); 280 //HttpServerContextObj objstate= new HttpServerContextObj(req,resp);
@@ -444,6 +444,7 @@ namespace OpenSim.Framework.Servers.HttpServer
444 try 444 try
445 { 445 {
446 response.Send(); 446 response.Send();
447 response.FreeContext();
447 } 448 }
448 catch (SocketException e) 449 catch (SocketException e)
449 { 450 {
@@ -746,6 +747,7 @@ namespace OpenSim.Framework.Servers.HttpServer
746 try 747 try
747 { 748 {
748 response.Send(); 749 response.Send();
750 response.FreeContext();
749 } 751 }
750 catch (SocketException e) 752 catch (SocketException e)
751 { 753 {
@@ -778,6 +780,7 @@ namespace OpenSim.Framework.Servers.HttpServer
778 try 780 try
779 { 781 {
780 response.Send(); 782 response.Send();
783 response.FreeContext();
781 } 784 }
782 catch (SocketException e) 785 catch (SocketException e)
783 { 786 {
@@ -888,6 +891,7 @@ namespace OpenSim.Framework.Servers.HttpServer
888 { 891 {
889 response.Send(); 892 response.Send();
890 response.OutputStream.Flush(); 893 response.OutputStream.Flush();
894 response.FreeContext();
891 //response.OutputStream.Close(); 895 //response.OutputStream.Close();
892 } 896 }
893 catch (IOException e) 897 catch (IOException e)
@@ -1103,6 +1107,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1103 try 1107 try
1104 { 1108 {
1105 response.Send(); 1109 response.Send();
1110 response.FreeContext();
1106 } 1111 }
1107 catch (SocketException f) 1112 catch (SocketException f)
1108 { 1113 {
@@ -1377,7 +1382,11 @@ namespace OpenSim.Framework.Servers.HttpServer
1377 //response.OutputStream.Close(); 1382 //response.OutputStream.Close();
1378 try 1383 try
1379 { 1384 {
1385 response.OutputStream.Flush();
1380 response.Send(); 1386 response.Send();
1387
1388 if (!response.KeepAlive)
1389 response.FreeContext();
1381 } 1390 }
1382 catch (SocketException e) 1391 catch (SocketException e)
1383 { 1392 {
@@ -1414,6 +1423,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1414 try 1423 try
1415 { 1424 {
1416 response.Send(); 1425 response.Send();
1426 response.FreeContext();
1417 } 1427 }
1418 catch (SocketException e) 1428 catch (SocketException e)
1419 { 1429 {
@@ -1449,6 +1459,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1449 try 1459 try
1450 { 1460 {
1451 response.Send(); 1461 response.Send();
1462 response.FreeContext();
1452 } 1463 }
1453 catch (SocketException e) 1464 catch (SocketException e)
1454 { 1465 {