diff options
author | UbitUmarov | 2017-05-25 10:23:52 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-25 10:23:52 +0100 |
commit | 27779953315e160067080b6f17945ab54695d63f (patch) | |
tree | 36e66eeaf84fd48382ab89278c7b150723a45235 /OpenSim/Framework/Servers/HttpServer | |
parent | merge master (diff) | |
parent | add some checks for valid endpoints (diff) | |
download | opensim-SC-27779953315e160067080b6f17945ab54695d63f.zip opensim-SC-27779953315e160067080b6f17945ab54695d63f.tar.gz opensim-SC-27779953315e160067080b6f17945ab54695d63f.tar.bz2 opensim-SC-27779953315e160067080b6f17945ab54695d63f.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index 94a9490..ffc6ad3 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
@@ -91,7 +91,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
91 | PoolWorkerJob, | 91 | PoolWorkerJob, |
92 | string.Format("PollServiceWorkerThread {0}:{1}", i, m_server.Port), | 92 | string.Format("PollServiceWorkerThread {0}:{1}", i, m_server.Port), |
93 | ThreadPriority.Normal, | 93 | ThreadPriority.Normal, |
94 | false, | 94 | true, |
95 | false, | 95 | false, |
96 | null, | 96 | null, |
97 | int.MaxValue); | 97 | int.MaxValue); |
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
101 | this.CheckRetries, | 101 | this.CheckRetries, |
102 | string.Format("PollServiceWatcherThread:{0}", m_server.Port), | 102 | string.Format("PollServiceWatcherThread:{0}", m_server.Port), |
103 | ThreadPriority.Normal, | 103 | ThreadPriority.Normal, |
104 | false, | 104 | true, |
105 | true, | 105 | true, |
106 | null, | 106 | null, |
107 | 1000 * 60 * 10); | 107 | 1000 * 60 * 10); |