diff options
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 14 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/GenericHTTPMethod.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/MessageServerInfo.cs | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 00c81c8..7c268ed 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -30,18 +30,20 @@ using System.Collections; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Net; | 32 | using System.Net; |
33 | using System.Net.Sockets; | ||
34 | using System.Reflection; | ||
33 | using System.Text; | 35 | using System.Text; |
34 | using System.Threading; | 36 | using System.Threading; |
35 | using System.Xml; | 37 | using System.Xml; |
36 | using Nwc.XmlRpc; | ||
37 | using libsecondlife.StructuredData; | 38 | using libsecondlife.StructuredData; |
38 | using OpenSim.Framework.Console; | 39 | using log4net; |
40 | using Nwc.XmlRpc; | ||
39 | 41 | ||
40 | namespace OpenSim.Framework.Servers | 42 | namespace OpenSim.Framework.Servers |
41 | { | 43 | { |
42 | public class BaseHttpServer | 44 | public class BaseHttpServer |
43 | { | 45 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 47 | ||
46 | protected Thread m_workerThread; | 48 | protected Thread m_workerThread; |
47 | protected HttpListener m_httpListener; | 49 | protected HttpListener m_httpListener; |
@@ -199,7 +201,7 @@ namespace OpenSim.Framework.Servers | |||
199 | } | 201 | } |
200 | } | 202 | } |
201 | } | 203 | } |
202 | catch (System.Net.Sockets.SocketException e) | 204 | catch (SocketException e) |
203 | { | 205 | { |
204 | // At least on linux, it appears that if the client makes a request without requiring the response, | 206 | // At least on linux, it appears that if the client makes a request without requiring the response, |
205 | // an unconnected socket exception is thrown when we close the response output stream. There's no | 207 | // an unconnected socket exception is thrown when we close the response output stream. There's no |
@@ -346,7 +348,7 @@ namespace OpenSim.Framework.Servers | |||
346 | { | 348 | { |
347 | response.OutputStream.Close(); | 349 | response.OutputStream.Close(); |
348 | } | 350 | } |
349 | catch (System.Net.Sockets.SocketException) | 351 | catch (SocketException) |
350 | { | 352 | { |
351 | // This has to be here to prevent a Linux/Mono crash | 353 | // This has to be here to prevent a Linux/Mono crash |
352 | } | 354 | } |
@@ -602,7 +604,7 @@ namespace OpenSim.Framework.Servers | |||
602 | m_workerThread.Name = "HttpThread"; | 604 | m_workerThread.Name = "HttpThread"; |
603 | m_workerThread.IsBackground = true; | 605 | m_workerThread.IsBackground = true; |
604 | m_workerThread.Start(); | 606 | m_workerThread.Start(); |
605 | OpenSim.Framework.ThreadTracker.Add(m_workerThread); | 607 | ThreadTracker.Add(m_workerThread); |
606 | } | 608 | } |
607 | 609 | ||
608 | private void StartHTTP() | 610 | private void StartHTTP() |
diff --git a/OpenSim/Framework/Servers/GenericHTTPMethod.cs b/OpenSim/Framework/Servers/GenericHTTPMethod.cs index f6bd65b..1358a00 100644 --- a/OpenSim/Framework/Servers/GenericHTTPMethod.cs +++ b/OpenSim/Framework/Servers/GenericHTTPMethod.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 | ||
28 | using System; | ||
29 | using System.Collections; | 28 | using System.Collections; |
30 | 29 | ||
31 | namespace OpenSim.Framework.Servers | 30 | namespace OpenSim.Framework.Servers |
diff --git a/OpenSim/Framework/Servers/MessageServerInfo.cs b/OpenSim/Framework/Servers/MessageServerInfo.cs index 9bcd4e1..17b5f10 100644 --- a/OpenSim/Framework/Servers/MessageServerInfo.cs +++ b/OpenSim/Framework/Servers/MessageServerInfo.cs | |||
@@ -25,9 +25,7 @@ | |||
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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
30 | using System.Text; | ||
31 | 29 | ||
32 | namespace OpenSim.Framework.Servers | 30 | namespace OpenSim.Framework.Servers |
33 | { | 31 | { |