diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 16 |
1 files changed, 8 insertions, 8 deletions
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; | |||
35 | using System.Text; | 35 | using System.Text; |
36 | using System.Threading; | 36 | using System.Threading; |
37 | using System.Xml; | 37 | using System.Xml; |
38 | using OpenMetaverse.StructuredData; | 38 | using HttpServer; |
39 | using log4net; | 39 | using log4net; |
40 | using Nwc.XmlRpc; | 40 | using Nwc.XmlRpc; |
41 | using OpenMetaverse.StructuredData; | ||
41 | using CoolHTTPListener = HttpServer.HttpListener; | 42 | using CoolHTTPListener = HttpServer.HttpListener; |
42 | using IHttpClientContext = HttpServer.IHttpClientContext; | 43 | using HttpListener=System.Net.HttpListener; |
43 | using IHttpRequest = HttpServer.IHttpRequest; | ||
44 | 44 | ||
45 | namespace OpenSim.Framework.Servers | 45 | namespace 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) |