aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-241-0/+2
|\
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+2
| | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-082-11/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-072-11/+5
| | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
* | Merge branch 'master' into bigmergeMelanie2011-12-0511-14/+209
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-0511-14/+209
| | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Merge branch 'master' into bigmergeMelanie2011-12-011-15/+48
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+3
| |
| * With "debug http 1", show the path with the query string instead of just the ↵Justin Clark-Casey (justincc)2011-11-291-21/+21
| | | | | | | | | | | | path. Also simplifies debug levels to just 0 and 1
| * Add "debug http" command for currently simple extra debug logging of ↵Justin Clark-Casey (justincc)2011-11-291-12/+43
| | | | | | | | non-event queue inbound http requests to a simulator
* | Merge branch 'master' into bigmergeMelanie2011-11-171-0/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * send a watchdog heartbeat for a poll worker thread when it's actually runJustin Clark-Casey (justincc)2011-11-151-0/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-101-8/+6
|\ \ | |/
| * Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)2011-11-071-8/+6
| |
* | Merge branch 'master' into bigmergeMelanie2011-10-263-19/+27
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Restart the event queue worker threads that I accidentally disabled earlier ↵Justin Clark-Casey (justincc)2011-10-251-7/+9
| | | | | | | | | | | | today in 8a0a78c. Also adds these to the watchdogs with very large timeouts (should really be infinite)
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-253-19/+25
| | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
* | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmergeMelanie2011-10-251-12/+2
|\ \ | |/
| * Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)2011-10-241-12/+2
| | | | | | | | Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
* | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmergeMelanie2011-10-252-5/+9
|\ \ | |/
| * Fix bugs in EventQueueGetModule.ClientClosed() and ↵Justin Clark-Casey (justincc)2011-10-242-5/+9
| | | | | | | | | | | | BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler Actually doing the tear down appear to have no ill effects with region crossing and teleport.
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2011-09-301-1/+1
| | | | | | | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
* | Resolve merge commits, stage 1Tom2011-09-041-57/+55
|\ \ | |/
| * read m_rpcHandlersKeepAlive under appropriate lockJustin Clark-Casey (justincc)2011-08-221-2/+4
| |
| * oops, fix build break from last commitJustin Clark-Casey (justincc)2011-08-221-12/+8
| |
| * improve locking of m_agentHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-10/+10
| |
| * improve locking of m_HTTPHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+2
| |
| * improve locking of m_streamHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+4
| |
| * remove necessity to catch a KeyNotFoundException in ↵Justin Clark-Casey (justincc)2011-08-221-11/+6
| | | | | | | | BaseHttpServer.RemoveLLSDHandler()
| * improve locking of m_llsdHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-30/+32
| |
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-221-3/+3
| |
| * improve locking of m_rpcHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-1/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-131-2/+2
|\ \ | |/
| * First pass at making the V2 map work. Standalones only for now. There are ↵Diva Canto2011-06-121-2/+2
| | | | | | | | some issues with the zoom level -- TBD.
* | Some additional protection, it seems that responsedata needs to be locked, ↵Tom2011-05-261-5/+14
| | | | | | | | but I can't immediately see where it's being accessed from another thread. For now, this will protect the server
* | If a response cannot be obtained (the script has no handler) return a more ↵Tom2011-05-171-4/+18
|/ | | | friendly 500 error instead of crashing out with a null reference and letting the connection hang
* Adding ssl supportBlueWall2011-05-051-0/+14
| | | | | Adding ssl support for "Out of Band" applications such as the remote admin module or Robust services
* Get Viewer 2 voice working with OpenSim.Justin Clark-Casey (justincc)2011-04-201-1/+1
| | | | | | | | See http://opensimulator.org/mantis/view.php?id=5336 It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop. Viewer 1 was quite happy to ignore the lack of response. This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work. However, at some point we need to fill out the watcher response, whatever that is.
* Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵Diva Canto2011-04-123-445/+0
| | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
* Thanks Kevin Cozens for a patch that:BlueWall2011-03-171-1/+1
| | | | Fixes several spelling mistakes
* minor: bring comment into line with code realityJustin Clark-Casey (justincc)2011-03-161-1/+1
|
* Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
| | | | | request method and target are reported correctly and drop the txn id as it's empty 99% of the time.
* XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386Diva Canto2011-02-161-1/+13
|
* Added a couple of console commands to help diagnose issues:Diva Canto2011-02-051-0/+32
| | | | | show circuits: shows the lists of agent circuit data show http-handlers: shows the currently registered http handlers
* With mic's permission, adjust long call time info messages to 500ms from 200msJustin Clark-Casey (justincc)2011-01-191-2/+3
|
* Added more performance checks to the HTTP server. Each requestMic Bowman2011-01-051-1/+15
| | | | | coming through the WebUtil fns has a request id in the header that can match the request to the actual work done by the service
* Shooting in the dark for solutions to the appearance problemMic Bowman2010-12-201-2/+2
|
* minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-12-101-1/+1
|
* Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-051-0/+4
|\
generated by cgit v1.1 at 2024-11-08 05:55:23 +0000