aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Collapse)AuthorAgeFilesLines
* make a few more threads background onesUbitUmarov2017-05-251-2/+2
|
* please DIE! PLEASE??UbitUmarov2017-05-231-4/+7
|
* make sure we drop requests if DoHTTPGruntWork failsUbitUmarov2017-05-221-4/+9
|
* 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
|
* let StreamReader be in using statementsUbitUmarov2017-05-072-31/+18
|
* Massive tab and trailing space cleanupMelanie Thielker2017-01-0518-121/+121
|
* JsonRpc: don't try to connect to a empty uriUbitUmarov2016-12-081-0/+3
|
* put back the dangerous resp.ReuseContext = true option, that for some odd ↵UbitUmarov2016-08-211-2/+2
| | | | reason OSgrid nginx configuration seems to need
* 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
* "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
|
* On to 0.8.3!Diva Canto2015-10-181-1/+1
| | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* dont let http keepalive and context reuse be trueUbitUmarov2015-09-232-3/+16
|
* at last we can login and see objects ( friends is dead and disable inUbitUmarov2015-09-031-50/+6
| | | | scenepresence)
* seems to compile ( tests comented out)UbitUmarov2015-09-022-161/+27
|
* bad merge?UbitUmarov2015-09-014-42/+344
|\
| * change pollService stop() to send 503 error and no keepalive. ( untested )UbitUmarov2015-08-182-6/+32
| |
| * do keepalive on mesh and texture GET. Dont use reusecontext any where.UbitUmarov2015-08-181-1/+1
| | | | | | | | | | | | setting of keepalive is wrong, it should follow the requested one ( or always as http1.1) only deny if needed (errors). KeepAlive may increase stress on number of avaiable file descritors.
| * try to serialize http requests from same connection, so they are processedUbitUmarov2015-08-182-0/+84
| | | | | | | | in order. ( next commits will be about necessary keepAlive changes needed)
| * TEST**** wingridproxy detection at grid login. Untested possible notUbitUmarov2014-10-241-0/+15
| | | | | | | | | | very reliable. Adds some load even on region servers because of code at BaseHttpServer.
| * change/fix previus commitsUbitUmarov2014-10-131-2/+10
| |
| * tune poll smartThreadpool use and give it a nameUbitUmarov2014-10-131-2/+5
| |
| * change previus code, send a NoEvents response back to http server, evenUbitUmarov2014-07-241-3/+0
| | | | | | | | | | if we know there is no one there, so that the server finishes handling it.
| * request.DoHTTPGruntWork(..) is now identical to our version, so useUbitUmarov2014-07-231-40/+5
| | | | | | | | | | those again, getting code closer to os again
| * Merge branch 'master' into careminsterMelanie2013-11-231-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * \ Merge branch 'master' into careminsterMelanie2013-11-033-0/+317
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-061-0/+1
| |\ \ \ | | | | | | | | | | | | | | | careminster
| | * | | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
| * | | | Merge branch 'master' into careminsterMelanie2013-10-062-3/+66
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * | | | Merge branch 'master' into careminsterMelanie2013-10-041-1/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-244-4/+65
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-189-17/+112
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-232-18/+32
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-06-112-319/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Clean up poll serviceMelanie2013-06-072-319/+0
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-112-7/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * \ \ \ \ \ \ \ \ \ 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-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-191-3/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ 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' 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
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-073-1/+1140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
generated by cgit v1.1 at 2024-12-24 16:48:43 +0000