aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/BaseHTTPHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs16
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs5
-rw-r--r--OpenSim/Framework/Servers/BaseStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/BinaryStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/IHttpAgentHandler.cs4
-rw-r--r--OpenSim/Framework/Servers/IStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/OSHttpRequest.cs2
-rw-r--r--OpenSim/Framework/Servers/OSHttpResponse.cs2
-rw-r--r--OpenSim/Framework/Servers/RestDeserialiseHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/RestHTTPHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/RestSessionService.cs2
-rw-r--r--OpenSim/Framework/Servers/RestStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/Tests/OSHttpTests.cs9
14 files changed, 14 insertions, 33 deletions
diff --git a/OpenSim/Framework/Servers/BaseHTTPHandler.cs b/OpenSim/Framework/Servers/BaseHTTPHandler.cs
index a7c3562..2aa37fb 100644
--- a/OpenSim/Framework/Servers/BaseHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/BaseHTTPHandler.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections; 28using System.Collections;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index d69b2c0..620a7f6 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -35,12 +35,12 @@ using System.Reflection;
35using System.Text; 35using System.Text;
36using System.Threading; 36using System.Threading;
37using System.Xml; 37using System.Xml;
38using OpenMetaverse.StructuredData; 38using HttpServer;
39using log4net; 39using log4net;
40using Nwc.XmlRpc; 40using Nwc.XmlRpc;
41using OpenMetaverse.StructuredData;
41using CoolHTTPListener = HttpServer.HttpListener; 42using CoolHTTPListener = HttpServer.HttpListener;
42using IHttpClientContext = HttpServer.IHttpClientContext; 43using HttpListener=System.Net.HttpListener;
43using IHttpRequest = HttpServer.IHttpRequest;
44 44
45namespace OpenSim.Framework.Servers 45namespace OpenSim.Framework.Servers
46{ 46{
@@ -219,7 +219,7 @@ namespace OpenSim.Framework.Servers
219 public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request) 219 public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request)
220 { 220 {
221 OSHttpRequest req = new OSHttpRequest(context, request); 221 OSHttpRequest req = new OSHttpRequest(context, request);
222 OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(context, request)); 222 OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request));
223 //resp.KeepAlive = req.KeepAlive; 223 //resp.KeepAlive = req.KeepAlive;
224 //m_log.Info("[Debug BASE HTTP SERVER]: Got Request"); 224 //m_log.Info("[Debug BASE HTTP SERVER]: Got Request");
225 //HttpServerContextObj objstate= new HttpServerContextObj(req,resp); 225 //HttpServerContextObj objstate= new HttpServerContextObj(req,resp);
@@ -1373,7 +1373,7 @@ namespace OpenSim.Framework.Servers
1373 { 1373 {
1374 //m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 1374 //m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
1375 //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/"); 1375 //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/");
1376 m_httpListener2 = new HttpServer.HttpListener(IPAddress.Any, (int)m_port); 1376 m_httpListener2 = new CoolHTTPListener(IPAddress.Any, (int)m_port);
1377 m_httpListener2.ExceptionThrown += httpServerException; 1377 m_httpListener2.ExceptionThrown += httpServerException;
1378 m_httpListener2.LogWriter = httpserverlog; 1378 m_httpListener2.LogWriter = httpserverlog;
1379 1379
@@ -1408,7 +1408,7 @@ namespace OpenSim.Framework.Servers
1408 } 1408 }
1409 } 1409 }
1410 1410
1411 public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err) 1411 public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err)
1412 { 1412 {
1413 switch (err) 1413 switch (err)
1414 { 1414 {
@@ -1564,11 +1564,11 @@ namespace OpenSim.Framework.Servers
1564 /// Relays HttpServer log messages to our own logging mechanism. 1564 /// Relays HttpServer log messages to our own logging mechanism.
1565 /// </summary> 1565 /// </summary>
1566 /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information 1566 /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information
1567 public class HttpServerLogWriter : HttpServer.ILogWriter 1567 public class HttpServerLogWriter : ILogWriter
1568 { 1568 {
1569 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 1569 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
1570 1570
1571 public void Write(object source, HttpServer.LogPrio priority, string message) 1571 public void Write(object source, LogPrio priority, string message)
1572 { 1572 {
1573 /* 1573 /*
1574 switch (priority) 1574 switch (priority)
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index ff53e1a..4cbbecc 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -38,6 +38,7 @@ using log4net.Core;
38using log4net.Repository; 38using log4net.Repository;
39using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
40using OpenSim.Framework.Statistics; 40using OpenSim.Framework.Statistics;
41using Timer=System.Timers.Timer;
41 42
42namespace OpenSim.Framework.Servers 43namespace OpenSim.Framework.Servers
43{ 44{
@@ -52,7 +53,7 @@ namespace OpenSim.Framework.Servers
52 /// This will control a periodic log printout of the current 'show stats' (if they are active) for this 53 /// This will control a periodic log printout of the current 'show stats' (if they are active) for this
53 /// server. 54 /// server.
54 /// </summary> 55 /// </summary>
55 private System.Timers.Timer m_periodicDiagnosticsTimer = new System.Timers.Timer(60 * 60 * 1000); 56 private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
56 57
57 protected ConsoleBase m_console; 58 protected ConsoleBase m_console;
58 59
@@ -266,7 +267,7 @@ namespace OpenSim.Framework.Servers
266 267
267 // If there is no threshold set then the threshold is effectively everything. 268 // If there is no threshold set then the threshold is effectively everything.
268 Level thresholdLevel 269 Level thresholdLevel
269 = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All); 270 = (null != consoleAppender.Threshold ? consoleAppender.Threshold : Level.All);
270 271
271 Notice(String.Format("Console log level is {0}", thresholdLevel)); 272 Notice(String.Format("Console log level is {0}", thresholdLevel));
272 } 273 }
diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs
index 6b0614f..771def4 100644
--- a/OpenSim/Framework/Servers/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using System.Net;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
32{ 31{
diff --git a/OpenSim/Framework/Servers/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
index 26a6f10..6540798 100644
--- a/OpenSim/Framework/Servers/BinaryStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.IO; 28using System.IO;
29using System.Text; 29using System.Text;
30using System.Net;
31 30
32namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
33{ 32{
diff --git a/OpenSim/Framework/Servers/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/IHttpAgentHandler.cs
index ff3a5b9..e6ad57e 100644
--- a/OpenSim/Framework/Servers/IHttpAgentHandler.cs
+++ b/OpenSim/Framework/Servers/IHttpAgentHandler.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Collections;
29using System.IO;
30using System.Net;
31
32namespace OpenSim.Framework.Servers 28namespace OpenSim.Framework.Servers
33{ 29{
34 public interface IHttpAgentHandler 30 public interface IHttpAgentHandler
diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/IStreamHandler.cs
index b3ce34d..76bf4d5 100644
--- a/OpenSim/Framework/Servers/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/IStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.Collections; 28using System.Collections;
29using System.IO; 29using System.IO;
30using System.Net;
31 30
32namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
33{ 32{
diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs
index 4c7d7ce..8e0cb38 100644
--- a/OpenSim/Framework/Servers/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequest.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Collections.Specialized; 31using System.Collections.Specialized;
32using System.Net;
33using System.IO; 32using System.IO;
33using System.Net;
34using System.Reflection; 34using System.Reflection;
35using System.Text; 35using System.Text;
36using HttpServer; 36using HttpServer;
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs
index 4947156..ff02edd 100644
--- a/OpenSim/Framework/Servers/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/OSHttpResponse.cs
@@ -25,8 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections;
30using System.IO; 28using System.IO;
31using System.Net; 29using System.Net;
32using System.Text; 30using System.Text;
diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
index 5c2dd4a..41d86e5 100644
--- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using System.Net;
30using System.Xml; 29using System.Xml;
31using System.Xml.Serialization; 30using System.Xml.Serialization;
32 31
diff --git a/OpenSim/Framework/Servers/RestHTTPHandler.cs b/OpenSim/Framework/Servers/RestHTTPHandler.cs
index 2974c56..5722885 100644
--- a/OpenSim/Framework/Servers/RestHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/RestHTTPHandler.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections; 28using System.Collections;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs
index 958ee26..60da05e 100644
--- a/OpenSim/Framework/Servers/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/RestSessionService.cs
@@ -28,12 +28,10 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net; 30using System.Net;
31using System.Collections.Generic;
32using System.Reflection; 31using System.Reflection;
33using System.Text; 32using System.Text;
34using System.Xml; 33using System.Xml;
35using System.Xml.Serialization; 34using System.Xml.Serialization;
36
37using log4net; 35using log4net;
38 36
39namespace OpenSim.Framework.Servers 37namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/RestStreamHandler.cs b/OpenSim/Framework/Servers/RestStreamHandler.cs
index 44c9dfc..afd7fe5 100644
--- a/OpenSim/Framework/Servers/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/RestStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.IO; 28using System.IO;
29using System.Text; 29using System.Text;
30using System.Net;
31 30
32namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
33{ 32{
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index fe553c9..3a297bf 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -31,23 +31,18 @@ using System.IO;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Text; 33using System.Text;
34
35using HttpServer; 34using HttpServer;
36using HttpServer.Exceptions;
37using HttpServer.FormDecoders; 35using HttpServer.FormDecoders;
38
39using NUnit.Framework; 36using NUnit.Framework;
40using NUnit.Framework.SyntaxHelpers; 37using NUnit.Framework.SyntaxHelpers;
41 38
42using OpenSim.Framework.Servers;
43
44namespace OpenSim.Framework.Servers.Tests 39namespace OpenSim.Framework.Servers.Tests
45{ 40{
46 [TestFixture] 41 [TestFixture]
47 public class OSHttpTests 42 public class OSHttpTests
48 { 43 {
49 // we need an IHttpClientContext for our tests 44 // we need an IHttpClientContext for our tests
50 public class TestHttpClientContext: HttpServer.IHttpClientContext 45 public class TestHttpClientContext: IHttpClientContext
51 { 46 {
52 private bool _secured; 47 private bool _secured;
53 public bool Secured 48 public bool Secured
@@ -68,7 +63,7 @@ namespace OpenSim.Framework.Servers.Tests
68 public void Send(byte[] buffer, int offset, int size) {} 63 public void Send(byte[] buffer, int offset, int size) {}
69 } 64 }
70 65
71 public class TestHttpRequest: HttpServer.IHttpRequest 66 public class TestHttpRequest: IHttpRequest
72 { 67 {
73 public bool BodyIsComplete 68 public bool BodyIsComplete
74 { 69 {