aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Clean up poll serviceMelanie2013-06-072-319/+0
|
* Send 503 when throttling texturesMelanie2013-04-251-1/+1
|
* Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-191-3/+14
|\
| * *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a ↵teravus2013-03-161-3/+14
| | | | | | | | connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
* | Merge branch 'master' into careminsterMelanie2013-03-053-1/+24
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-03-051-1/+16
| |\
| | * * Add a Max Payload size property to the Websocket Server Handler. If you ↵teravus2013-03-051-1/+16
| | | | | | | | | | | | would like to restrict the maximum packet size, (and therefore protect against Memory DOSing) then you should set this. I defaulted it to 40MB. This means that in theory, a malicious user could connect and send a packet that claims that the payload is up to 40 mb (even if it doesn't actually turn out to be 40mb. More testing needs to be done on it where the packets are maliciously malformed.
| * | Add method to remove JsonRpc Handlers from the serverBlueWall2013-03-032-0/+8
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-271-12/+3
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-271-12/+3
| | | | | | | | places where we were not already.
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-151-0/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * * gracefully handle a Situation where a double close is called on the ↵teravus2013-02-141-0/+2
| | | | | | | | WebSocket handler
* | Merge branch 'master' into careminsterMelanie2013-02-073-1/+1140
|\ \ | |/ | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * * Adds Websocket support to baseHttpServer and IHttpServer.cs . This ↵teravus2013-02-072-1/+11
| |\ | | | | | | | | | allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
| * | This is the final commit that enables the Websocket handlerteravus2013-02-072-2/+1095
| | |
| * | We're not really done here.. but we're getting there. Socket Read is ↵teravus2013-02-051-1/+37
| | | | | | | | | | | | working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
* | | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| |/ | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
|\ \ | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-232-5/+15
| |\
| * | Add additional return statusBlueWall2013-01-232-4/+23
| | | | | | | | | | | | Adding additional return status for JsonRpcMethod. Now returns true/false
* | | Merge branch 'master' into careminsterMelanie2013-01-192-4/+14
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 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-192-5/+15
| |/ | | | | | | | | | | destructor. Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-164-0/+294
|\ \ | |/
| * Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-154-0/+294
| | | | | | | | | | 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 commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-1/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| * | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-091-1/+2
| | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
* | | Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
|\ \ \ | | |/ | |/|
| * | A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-141-0/+33
| | |
* | | 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
| | |
| * | Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-303-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
| * | Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-303-0/+4
| | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* | | 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-273-38/+38
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+1
| | | | | | | | | | | | another working thread
| * | just remove the damm thingUbitUmarov2012-09-263-25/+3
| | |
| * | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-262-3/+10
| | | | | | | | | | | | control flag to false
generated by cgit v1.1 at 2024-12-25 09:10:33 +0000