aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-231-3/+22
|\
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-231-0/+3
| |\
| * | Add additional return statusBlueWall2013-01-231-3/+22
| | | | | | | | | | | | Adding additional return status for JsonRpcMethod. Now returns true/false
* | | Merge branch 'master' into careminsterMelanie2013-01-191-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * | Explicitly stop PollServiceRequestManager() rather than relying on its ↵Justin Clark-Casey (justincc)2013-01-191-0/+3
| |/ | | | | | | | | | | destructor. Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-0/+108
|\ \ | |/
| * Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-151-0/+108
| | | | | | | | | | Added registration json-rpc handlers in the http server. Covers version 2.0 See: http://www.jsonrpc.org/specification
* | Merge branch 'master' into careminsterMelanie2012-12-071-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather ↵Justin Clark-Casey (justincc)2012-12-051-1/+1
| | | | | | | | than creating a new CultureInfo separately
* | Merge branch 'master' into careminsterMelanie2012-11-251-53/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Delete unused BaseHttpServer.HandleAgentRequest()Justin Clark-Casey (justincc)2012-11-231-53/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-201-2/+5
|\ \ | |/
| * minor: If logging full incoming HTTP data, don't deceptively print ... at ↵Justin Clark-Casey (justincc)2012-11-201-2/+5
| | | | | | | | the end of the body.
* | Merge branch 'master' into careminsterMelanie2012-10-231-9/+3
|\ \ | |/
| * minor: Get content type handler logger to log "unset" for the content type ↵Justin Clark-Casey (justincc)2012-10-231-1/+1
| | | | | | | | instead of blank if no content type was set.
| * minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data ↵Justin Clark-Casey (justincc)2012-10-231-8/+2
| | | | | | | | | | | | where this wasn't already used. This allows log level 5 (log sample or large part of incoming post data) to operate and removes copy/paste.
| * If we're avoiding printing a long request warning for a GetTexture CAP call, ↵Justin Clark-Casey (justincc)2012-10-181-1/+1
| | | | | | | | | | | | check we received a request handler first since this is not guaranteed. Resolves harmless logged exception when content type and generic xml rpc requests take more than 3 seconds.
| * Allow setting max connections for an endpointMelanie2012-09-301-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-09-291-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Fix bug where debug http level 6 could not be specified. Also converts ↵Justin Clark-Casey (justincc)2012-09-291-3/+3
| | | | | | | | newlines at this level to '\n' to enable them to be logged.
* | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+4
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | just remove the damm thingUbitUmarov2012-09-261-0/+1
| | |
| * | Catch a nullref in the code to suppress GetTexture warnign spam we can'tMelanie2012-09-161-1/+1
| | | | | | | | | | | | do a thing about anyway.
| * | Sequence/throttle asset retrievals.Melanie2012-09-141-0/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-241-95/+135
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Make BaseHttpServer throws say something useful.Diva Canto2012-09-221-2/+2
| | |
| * | Comment out the long unused afaik HTTP agent handlers.Justin Clark-Casey (justincc)2012-09-211-73/+73
| | | | | | | | | | | | | | | | | | As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now. Other similar code uses HTTP or stream handlers instead. So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway. If this facility is actually being used then please notify me or uncomment it if you are core.
| * | Add request number counting to incoming HTTP requests in the same way that ↵Justin Clark-Casey (justincc)2012-09-211-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | this was already being done for outgoing HTTP requests. This allows us to associate debug logging messages with the right request. It also allows us to put a request number on 'long request' logging even if other debug logging is not enabled, which gives us some idea of whether every request is suffering this problem or only some. This is a separate internal number not associated with any incoming number in the opensim-request-id header, this will be clarified when logging of this incoming request number is re-enabled. This commit also adds port number to HTTP IN logging to allow us to distinguish between different request numbers on different ports.
| * | Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the ↵Justin Clark-Casey (justincc)2012-09-201-15/+32
| | | | | | | | | | | | | | | | | | | | | request took. This is only printed if debug http level >= 4 and the request didn't take more than the time considered 'long', in which case the existing log message is printed. This displaces the previous log levels 4 and 5 which are now 5 and 6 respectively.
| * | Add ability to turn on/off logging of outgoing HTTP requests flowing through ↵Justin Clark-Casey (justincc)2012-09-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | WebUtil. This is for debugging purposes. This is controlled via the "debug http" command which can already log incoming requests. This now gains a mandatory parameter of in, out or all to control what is logged. Log messages are also shortened and labelled and HTTP IN or HTTP OUT to be consistent with existing UDP PACKET IN and PACKET OUT messages.
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-15/+34
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-141-14/+33
| | | | | | | | | | | | at any time and to drop requests for avatars n longer in the scene
| * | Allow setting max connections for an endpointMelanie2012-09-141-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-161-12/+56
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * Fix bug in logging sample input at debug http level 4.Justin Clark-Casey (justincc)2012-09-121-1/+1
| | | | | | | | Also converts newlines to "\n" text.
| * Add levels 4 and 5 to "debug http" console command that will log a sample of ↵Justin Clark-Casey (justincc)2012-09-111-12/+56
| | | | | | | | | | | | incoming request data and the entire incoming data respectively. See "help debug http" for more details.
* | add a extra httppool thread to compensate for webfetchinventoryUbitUmarov2012-09-101-1/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-07-281-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-251-0/+1
| | | | | | | | with other monitoring code from OpenSim.Framework
* | Merge branch 'avination' into careminsterMelanie2012-07-161-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Eliminate a spurious exception report when a https url is accessed with a wrongMelanie2012-07-151-0/+2
| | | | | | | | | | | | CN
* | | Merge branch 'master' into careminsterMelanie2012-06-151-13/+27
|\ \ \ | | |/ | |/|
| * | Make the "debug http" command available for robust as well as the simulator. ↵Justin Clark-Casey (justincc)2012-06-151-0/+3
| | | | | | | | | | | | | | | | | | This allows one to see incoming requests as they happen. This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ↵Justin Clark-Casey (justincc)2012-06-151-8/+0
| | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance
| * | When setting debug http level, do this for all known http servers, not just ↵Justin Clark-Casey (justincc)2012-06-151-10/+10
| | | | | | | | | | | | the main instance.
| * | Shuffle "debug http" levels so that 1 and 2 now cause different levels of ↵Justin Clark-Casey (justincc)2012-06-141-8/+27
| | | | | | | | | | | | warn to be logged if we receive invalid xml for xmlrpc.
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752Justin Clark-Casey (justincc)2012-06-141-1/+1
| | | | | | | | | | | | | | | Accidentally make responseString null by default instead of String.Empty. It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!)
* | | 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.
generated by cgit v1.1 at 2024-12-19 06:14:58 +0000