diff options
| author | UbitUmarov | 2012-07-15 15:40:23 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-07-15 15:40:23 +0100 |
| commit | 35a5a064b0253052a0f81ae7a1efebf64a21cac1 (patch) | |
| tree | 35867cee2e7ecad8df6d64e6760d9c528135fac9 /OpenSim/Framework/Servers | |
| parent | messing around... Let terrain and water have nullphysicsactors, let (diff) | |
| parent | Eliminate a spurious exception report when a https url is accessed with a wrong (diff) | |
| download | opensim-SC-35a5a064b0253052a0f81ae7a1efebf64a21cac1.zip opensim-SC-35a5a064b0253052a0f81ae7a1efebf64a21cac1.tar.gz opensim-SC-35a5a064b0253052a0f81ae7a1efebf64a21cac1.tar.bz2 opensim-SC-35a5a064b0253052a0f81ae7a1efebf64a21cac1.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ad5af1f..a3a5029 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -1809,6 +1809,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1809 | 1809 | ||
| 1810 | public void httpServerException(object source, Exception exception) | 1810 | public void httpServerException(object source, Exception exception) |
| 1811 | { | 1811 | { |
| 1812 | if (source.ToString() == "HttpServer.HttpListener" && exception.ToString().StartsWith("Mono.Security.Protocol.Tls.TlsException")) | ||
| 1813 | return; | ||
| 1812 | m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString()); | 1814 | m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString()); |
| 1813 | /* | 1815 | /* |
| 1814 | if (HTTPDRunning)// && NotSocketErrors > 5) | 1816 | if (HTTPDRunning)// && NotSocketErrors > 5) |