aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-05-252-7/+8
|\
| * move assetsconnector threads to whatchdog; Abort all alive threads known to ↵UbitUmarov2017-05-251-1/+2
| | | | | | | | watchdog before exit
| * make a few more threads background onesUbitUmarov2017-05-251-2/+2
| |
| * add a bit more pre exit cleanupUbitUmarov2017-05-241-4/+4
| |
* | merge masterUbitUmarov2017-05-233-13/+35
|\ \ | |/
| * stop a few more threads on exitUbitUmarov2017-05-231-0/+2
| |
| * please DIE! PLEASE??UbitUmarov2017-05-233-6/+26
| |
| * make sure we drop requests if DoHTTPGruntWork failsUbitUmarov2017-05-221-4/+9
| |
* | reenqueue poll events while conn is open, and not expiredUbitUmarov2017-05-211-1/+5
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-05-212-35/+3
|\ \ | |/
| * remove LongPoll type and queues. Events should now have reduced latency ↵UbitUmarov2017-05-212-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 inputstreamUbitUmarov2017-05-082-1/+8
| |
* | some conditional dispose on http requests inputstreamUbitUmarov2017-05-082-1/+8
| |
* | fix mergeUbitUmarov2017-05-072-20/+16
|\ \ | |/
| * let StreamReader be in using statementsUbitUmarov2017-05-072-31/+18
| |
* | fix mergeUbitUmarov2017-05-031-2/+1
|\ \ | |/
| * give more information on Fatal Error during region startupUbitUmarov2017-04-261-2/+1
| |
* | fix mergeUbitUmarov2017-04-251-0/+17
|\ \ | |/
| * Allow setting the stats log file location in OpenSim.ini rather than ↵Melanie Thielker2017-03-311-0/+17
| | | | | | | | app.exe.config
* | fix mergeUbitUmarov2017-01-0523-241/+241
|\ \ | |/
| * Massive tab and trailing space cleanupMelanie Thielker2017-01-0523-241/+241
| |
* | some cleanup, use more using(), more checks so http request mem stream is closedUbitUmarov2016-12-301-42/+27
| |
* | Merge branch 'master' into httptestsUbitUmarov2016-12-091-0/+3
|\ \ | |/
| * JsonRpc: don't try to connect to a empty uriUbitUmarov2016-12-081-0/+3
| |
* | provide remote SSLcommonName to xmlRpcRequest methods, but in a away it can ↵UbitUmarov2016-12-091-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 ↵UbitUmarov2016-12-091-0/+4
| | | | | | | | callback
* | remove not needed sslport parameterUbitUmarov2016-12-081-6/+8
| |
* | add SSL certs validation options for regions to allow simple encriptation ↵UbitUmarov2016-12-071-1/+29
| | | | | | | | without any peer autentification using simple homemade (or even shared) certs.
* | keep a unsecure http port up for external services (datasnapshot search). ↵UbitUmarov2016-10-092-15/+30
| | | | | | | | Only fire poolservices on main http listener
* | changes to regions ssl suport: verify if hostnames are validate by the ↵UbitUmarov2016-10-091-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 ↵UbitUmarov2016-10-061-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 ↵UbitUmarov2016-09-034-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 httptestsUbitUmarov2016-09-032-3/+3
|\ \ | |/
| * fix a use of string Trim()UbitUmarov2016-08-241-1/+1
| |
| * put back the dangerous resp.ReuseContext = true option, that for some odd ↵UbitUmarov2016-08-211-2/+2
| | | | | | | | reason OSgrid nginx configuration seems to need
* | Merge branch 'master' into httptestsUbitUmarov2016-07-271-1/+10
|\ \ | |/
| * first step removing MegaRegions: refuse to run. Thanks to all that made ↵UbitUmarov2016-07-271-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 ↵UbitUmarov2016-07-172-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)UbitUmarov2016-07-171-4/+9
|/
* http send is blocking, so we need we need to do it async in all cases. - ↵UbitUmarov2016-07-162-20/+15
| | | | this will need revision after server changes
* disable OSHttpTests that will collide with testing new http server changesUbitUmarov2016-07-151-0/+3
|
* "reverting" the keep alive changes brought in from avination, to check if ↵Diva Canto2016-06-142-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 Canto2016-02-211-1/+1
| | | | replace anymore.
* minor cleanupUbitUmarov2015-12-091-17/+4
|
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-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 notMelanie Thielker2015-10-311-3/+3
| | | | | | | | work. Will eat your babies. Yada. Yada.
| * On to 0.8.3!Diva Canto2015-10-181-1/+1
| |
| * Clean up of simulation version, the number that rules the compatibility of ↵Diva Canto2015-10-181-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 Canto2015-10-181-1/+1
| | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* | Fixed merge conflictsDiva Canto2015-10-181-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