aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination-current' into careminsterMelanie2013-06-061-1/+1
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * Send 503 when throttling texturesMelanie2013-04-251-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-04-101-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | If OpenSimulator is writing a PID file and finds the file already present on ↵Justin Clark-Casey (justincc)2013-04-091-0/+5
| | | | | | | | | | | | | | | | | | startup, logging an error since this is commonly due to an unclean shutdown. Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
* | | Merge branch 'master' into careminsterMelanie2013-04-051-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * * In between the fog, a moment of clarity. This fixes mantis 6570teravus2013-04-041-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-152-1/+21
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Log same environment information to Robust log as is already done for ↵Justin Clark-Casey (justincc)2013-03-142-11/+21
| | | | | | | | simulator logs, for debug purposes
* | 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-2/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * Show http poll handlers in separate http (poll) section of "show ↵Justin Clark-Casey (justincc)2013-02-271-2/+5
| | | | | | | | | | | | http-handlers" console command instead of never showing them (due to a previous bug). The code was assuming that poll handlers were also included in general http handlers but this was not the case.
* | 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-074-1/+1145
|\ \ | |/ | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * * Adds Websocket support to baseHttpServer and IHttpServer.cs . This ↵teravus2013-02-074-3/+13
| |\ | | | | | | | | | 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-052-1/+42
| | | | | | | | | | | | working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
* | | Merge branch 'master' into careminsterMelanie2013-02-053-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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-053-3/+3
| |/ | | | | | | | | | | | | | | 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 'avination' into careminsterMelanie2013-01-241-2/+2
|\ \
| * | Implement get version RemoteAdmin callMelanie2013-01-231-2/+2
| | |
* | | 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-165-0/+298
|\ \ \ | |/ /
| * | Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-155-0/+298
| | | | | | | | | | | | | | | 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-255-176/+116
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-242-2/+4
| | | | | | | | automatically turns off any logging enabled between tests
| * Make "show threads" and "thread abort" console commands available on all serversJustin Clark-Casey (justincc)2012-11-232-102/+93
| |
| * Make "force gc" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-11/+12
| |
| * Make "show version" console command available across all serversJustin Clark-Casey (justincc)2012-11-232-8/+7
| |
| * Delete unused BaseHttpServer.HandleAgentRequest()Justin Clark-Casey (justincc)2012-11-231-53/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-222-332/+547
|\ \ | |/
| * Factor out command script code.Justin Clark-Casey (justincc)2012-11-221-2/+50
| | | | | | | | This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
| * Make "config show/set/get/save" console commands available on all serversJustin Clark-Casey (justincc)2012-11-221-3/+137
| |
| * Factor out common pid file creation and removal code.Justin Clark-Casey (justincc)2012-11-222-40/+47
| | | | | | | | Log path at which pid file is created or reason for failure to create.
| * Add "get log level" command - this returns the current server session ↵Justin Clark-Casey (justincc)2012-11-221-19/+31
| | | | | | | | | | | | console logging level. This supersedes getting information by calling "set log level" without a 4th argument, which is confusing.
generated by cgit v1.1 at 2024-12-18 09:29:13 +0000