aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-271-135/+244
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * adding status codes from rfc 6585SignpostMarv2012-05-241-2/+22
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * porting IDE tooltip-friendly documentation tweaks from Aurora-SimSignpostMarv2012-05-241-134/+223
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-05-101-2/+2
|\ \ | |/
| * Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-2/+2
| | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
* | Merge branch 'master' into careminsterMelanie2012-05-081-19/+19
|\ \ | |/
| * Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-05-071-19/+19
| |
* | Merge branch 'master' into careminsterMelanie2012-05-059-35/+88
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * minor: Tweak BaseHttpServer message to make it clear that this relates to ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | slow handling of inbound requests.
| * Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-039-35/+88
| | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
| * Revert "Log the full exception when errors occur in BaseHttpServer"Justin Clark-Casey (justincc)2012-04-271-19/+19
| | | | | | | | | | | | This reverts commit e31e7c68c8abfd61fed6dabac5403d8adf42ae87. Applied for patch assessment and accidentally committed too early.
| * Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-04-271-19/+19
| |
* | Merge branch 'master' into careminsterMelanie2012-04-201-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
| * Add more exception detail to Exception and IOException throws in ↵Justin Clark-Casey (justincc)2012-04-201-2/+2
| | | | | | | | BaseHttpServer.HandleRequest()
* | Merge branch 'master' into careminsterMelanie2012-04-071-2/+2
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Thank you, BaseHttpServer, for telling me where things go wrong.Diva Canto2012-04-061-2/+2
| |
* | 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
|\ \ | |/
generated by cgit v1.1 at 2024-12-21 03:13:22 +0000