Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into httptests | UbitUmarov | 2017-05-25 | 2 | -7/+8 |
|\ | |||||
| * | move assetsconnector threads to whatchdog; Abort all alive threads known to ↵ | UbitUmarov | 2017-05-25 | 1 | -1/+2 |
| | | | | | | | | watchdog before exit | ||||
| * | make a few more threads background ones | UbitUmarov | 2017-05-25 | 1 | -2/+2 |
| | | |||||
| * | add a bit more pre exit cleanup | UbitUmarov | 2017-05-24 | 1 | -4/+4 |
| | | |||||
* | | merge master | UbitUmarov | 2017-05-23 | 3 | -13/+35 |
|\ \ | |/ | |||||
| * | stop a few more threads on exit | UbitUmarov | 2017-05-23 | 1 | -0/+2 |
| | | |||||
| * | please DIE! PLEASE?? | UbitUmarov | 2017-05-23 | 3 | -6/+26 |
| | | |||||
| * | make sure we drop requests if DoHTTPGruntWork fails | UbitUmarov | 2017-05-22 | 1 | -4/+9 |
| | | |||||
* | | reenqueue poll events while conn is open, and not expired | UbitUmarov | 2017-05-21 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-21 | 2 | -35/+3 |
|\ \ | |/ | |||||
| * | remove LongPoll type and queues. Events should now have reduced latency ↵ | UbitUmarov | 2017-05-21 | 2 | -35/+3 |
| | | | | | | | | also. About previus commit, it maybe a modified ingen-e3s-v1.33 script that is broken, and not the original version, can't tell | ||||
| * | some conditional dispose on http requests inputstream | UbitUmarov | 2017-05-08 | 2 | -1/+8 |
| | | |||||
* | | some conditional dispose on http requests inputstream | UbitUmarov | 2017-05-08 | 2 | -1/+8 |
| | | |||||
* | | fix merge | UbitUmarov | 2017-05-07 | 2 | -20/+16 |
|\ \ | |/ | |||||
| * | let StreamReader be in using statements | UbitUmarov | 2017-05-07 | 2 | -31/+18 |
| | | |||||
* | | fix merge | UbitUmarov | 2017-05-03 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | give more information on Fatal Error during region startup | UbitUmarov | 2017-04-26 | 1 | -2/+1 |
| | | |||||
* | | fix merge | UbitUmarov | 2017-04-25 | 1 | -0/+17 |
|\ \ | |/ | |||||
| * | Allow setting the stats log file location in OpenSim.ini rather than ↵ | Melanie Thielker | 2017-03-31 | 1 | -0/+17 |
| | | | | | | | | app.exe.config | ||||
* | | fix merge | UbitUmarov | 2017-01-05 | 23 | -241/+241 |
|\ \ | |/ | |||||
| * | Massive tab and trailing space cleanup | Melanie Thielker | 2017-01-05 | 23 | -241/+241 |
| | | |||||
* | | some cleanup, use more using(), more checks so http request mem stream is closed | UbitUmarov | 2016-12-30 | 1 | -42/+27 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-09 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | JsonRpc: don't try to connect to a empty uri | UbitUmarov | 2016-12-08 | 1 | -0/+3 |
| | | |||||
* | | provide remote SSLcommonName to xmlRpcRequest methods, but in a away it can ↵ | UbitUmarov | 2016-12-09 | 1 | -0/+11 |
| | | | | | | | | be detected/parsed. This is used by some external modules like DTLNSLMoneyServer. But this module does need to change on this ( and it cannot override default validation rules, it needs to do it on its httplistener with method provided in previus commits | ||||
* | | suport client certificate validation per listenner, with a supplied static ↵ | UbitUmarov | 2016-12-09 | 1 | -0/+4 |
| | | | | | | | | callback | ||||
* | | remove not needed sslport parameter | UbitUmarov | 2016-12-08 | 1 | -6/+8 |
| | | |||||
* | | add SSL certs validation options for regions to allow simple encriptation ↵ | UbitUmarov | 2016-12-07 | 1 | -1/+29 |
| | | | | | | | | without any peer autentification using simple homemade (or even shared) certs. | ||||
* | | keep a unsecure http port up for external services (datasnapshot search). ↵ | UbitUmarov | 2016-10-09 | 2 | -15/+30 |
| | | | | | | | | Only fire poolservices on main http listener | ||||
* | | changes to regions ssl suport: verify if hostnames are validate by the ↵ | UbitUmarov | 2016-10-09 | 1 | -11/+135 |
| | | | | | | | | selected cert, make clear that for now all regions need to have the same ExternalHostName if using sll (due to other code that needs to be changed later) | ||||
* | | recover regions main http server ssl suport. Using a PKCS12 cert file, and ↵ | UbitUmarov | 2016-10-06 | 1 | -1/+9 |
| | | | | | | | | not certs store for now. Option http_listener_cn, cert CN need to the same as external IP. Self sign certs do seem to work, but the viewers option NoVerifySLLCert needs to be set true. CA check is not done but they do check the IP | ||||
* | | remove reuse context code, they had notthing worth using and on original ↵ | UbitUmarov | 2016-09-03 | 4 | -7/+7 |
| | | | | | | | | code when reusing contexts still in use, etc. Change DLL information to make clear it is a opensim fork, so our responsability not original author | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-09-03 | 2 | -3/+3 |
|\ \ | |/ | |||||
| * | fix a use of string Trim() | UbitUmarov | 2016-08-24 | 1 | -1/+1 |
| | | |||||
| * | put back the dangerous resp.ReuseContext = true option, that for some odd ↵ | UbitUmarov | 2016-08-21 | 1 | -2/+2 |
| | | | | | | | | reason OSgrid nginx configuration seems to need | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-07-27 | 1 | -1/+10 |
|\ \ | |/ | |||||
| * | first step removing MegaRegions: refuse to run. Thanks to all that made ↵ | UbitUmarov | 2016-07-27 | 1 | -1/+10 |
| | | | | | | | | MegaRegions possible, they where a important OpenSim feature, but can no longer be mantained | ||||
* | | add a Drop method to PollService Event handlers, Drop requests on ↵ | UbitUmarov | 2016-07-17 | 2 | -33/+67 |
| | | | | | | | | connections known to be lost or delay event check if they are sending a response | ||||
* | | identify contexts by ID now avaiable ( pipeline serialization) | UbitUmarov | 2016-07-17 | 1 | -4/+9 |
|/ | |||||
* | http send is blocking, so we need we need to do it async in all cases. - ↵ | UbitUmarov | 2016-07-16 | 2 | -20/+15 |
| | | | | this will need revision after server changes | ||||
* | disable OSHttpTests that will collide with testing new http server changes | UbitUmarov | 2016-07-15 | 1 | -0/+3 |
| | |||||
* | "reverting" the keep alive changes brought in from avination, to check if ↵ | Diva Canto | 2016-06-14 | 2 | -7/+2 |
| | | | | that's what's making osgrid fail. This is not really reverting, it's more manually resetting some places (not all) where keep alive is set. | ||||
* | Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global ↵ | Diva Canto | 2016-02-21 | 1 | -1/+1 |
| | | | | replace anymore. | ||||
* | minor cleanup | UbitUmarov | 2015-12-09 | 1 | -17/+4 |
| | |||||
* | Merge branch 'master' into avinationmerge | UbitUmarov | 2015-11-01 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Framework/Servers/ServerBase.cs OpenSim/Framework/VersionInfo.cs OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs OpenSim/Region/PhysicsModules/Ode/OdeScene.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/GatekeeperService.cs OpenSim/Services/Interfaces/IAvatarService.cs OpenSim/Services/LLLoginService/LLLoginService.cs | ||||
| * | Testing stage of the new versioning system. Use at own risk. May not | Melanie Thielker | 2015-10-31 | 1 | -3/+3 |
| | | | | | | | | work. Will eat your babies. Yada. Yada. | ||||
| * | On to 0.8.3! | Diva Canto | 2015-10-18 | 1 | -1/+1 |
| | | |||||
| * | Clean up of simulation version, the number that rules the compatibility of ↵ | Diva Canto | 2015-10-18 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | teleports: - It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure - Its definition moved to the global VersionInfo class As of now it's still 0.3. | ||||
* | | On to 0.8.3! | Diva Canto | 2015-10-18 | 1 | -1/+1 |
| | | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | ||||
* | | Fixed merge conflicts | Diva Canto | 2015-10-18 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Clean up of simulation version, the number that rules the compatibility of teleports: - It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure - Its definition moved to the global VersionInfo class As of now it's still 0.3. Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs |