aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-131-296/+116
|\ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
| * Don't include time to transmit response back to requester when assessing ↵Justin Clark-Casey (justincc)2012-06-131-297/+116
| | | | | | | | | | | | | | | | | | | | slow handling of requests. This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response. This is not something we can do much about on the server end - it's server-side delay that we're interested in. To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change. IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this. Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
* | 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-051-4/+12
|\ \ | |/ | | | | | | | | | | | | | | 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-031-4/+12
| | | | | | | | | | | | 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 commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-9/+3
|\ \ | |/ | | | | | | 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-071-9/+3
| | | | | | | | 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-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 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-251-2/+2
|\ \ | |/
| * Fix bugs in EventQueueGetModule.ClientClosed() and ↵Justin Clark-Casey (justincc)2011-10-241-2/+2
| | | | | | | | | | | | 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.
* 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
* minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-12-101-1/+1
|
generated by cgit v1.1 at 2024-12-24 22:32:25 +0000