ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-22 08:28:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,166 Commits 5 Branches 93 Tags
27dcb01b2ef97c3d3342caa6f266410fed13caa4
Commit Graph

198 Commits

Author SHA1 Message Date
UbitUmarov
0f4d54b8b2 put back the dangerous resp.ReuseContext = true option, that for some odd reason OSgrid nginx configuration seems to need 2016-08-21 20:52:31 +01:00
UbitUmarov
f636ef037a http send is blocking, so we need we need to do it async in all cases. - this will need revision after server changes 2016-07-16 20:23:30 +01:00
Diva Canto
e0a82a82de "reverting" the keep alive changes brought in from avination, to check if 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. 2016-06-14 08:58:37 -07:00
UbitUmarov
e441c9cac1 dont let http keepalive and context reuse be true 2015-09-23 23:59:50 +01:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
UbitUmarov
05d72f77ff do keepalive on mesh and texture GET. Dont use reusecontext any where. 
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.
 2015-08-18 21:32:03 +01:00
Freaky Tech
f68a1a2218 XML should not contain any BOM. Disabled BOM generation in BaseHttpServer 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-03-03 15:35:09 -05:00
UbitUmarov
fd79f75ba6 TEST**** wingridproxy detection at grid login. Untested possible not 
very reliable. Adds some load even on region servers because of code at
 BaseHttpServer.
 2014-10-24 02:12:30 +01:00
Oren Hurvitz
99ac770abb Close streams immediately when we finish using them 2014-07-21 08:30:03 +01:00
Oren Hurvitz
88f7a833dc Improved HTTP logging 2014-04-29 07:59:17 +01:00
Oren Hurvitz
bc06db3df4 - Created a standard function to send XML-RPC requests, which logs them like we do for other types of HTTP activity. 
- Changed OpenProfileClient to use the new XML-RPC sending function
- Improved logging in WebUtil
 2014-04-24 15:58:43 +01:00
Oren Hurvitz
2051535ce1 String matching in REST handlers: must allow '-' as a separator, because the "/map" handler uses it 2014-04-02 15:11:54 +01:00
Oren Hurvitz
aa217cf90f Better string matching when searching for REST handlers: must match an entire path component (ending with '/' or a similar character). 
For example, these should match: "/assets" and "/assets/12345", but these shouldn't match: "/assets" and "/assets_exist".
 2014-04-02 08:52:44 +03:00
Oren Hurvitz
bbfda8e19e Fixed last-resort sending of error response (HTTP 500) when an error occurs while handling a request. 
The previous code didn't actually send the response, so the caller was stuck until the timeout (100 seconds).
 2014-04-02 06:32:41 +01:00
Oren Hurvitz
6d1d58b654 Use the "X-Content-Encoding" header to indicate gzipped data, because old OpenSims fail if they get an unknown "Content-Encoding" 2014-03-25 18:09:23 +01:00
Oren Hurvitz
b1d8aa0b64 Use the "Content-Encoding" header to indicate gzipped streams 2014-03-25 15:36:59 +01:00
Oren Hurvitz
f90aee696a Always throw an exception if MakeRequest (used for HTTP POST) fails. (Previously many exceptions were ignored) 
Resolves http://opensimulator.org/mantis/view.php?id=6949
 2014-03-25 09:37:10 +01:00
Oren Hurvitz
f901a38204 Improved logging of HTTP requests 
- MemoryBuffer isn't seekable, so we can't log it. Log the string instead.
- Handle compressed streams
- Don't attempt to dump binary data. Either don't log it at all (if we know it's binary), or at least convert non-ASCII characters to ASCII.
- Log responses to HTTP requests
- Use the same log prefix for all of these log messages ("[LOGHTTP]"), to make them easy to see at a glance
- Increased the snippet length to 200 (80 doesn't show enough), and add "..." only if the message was actually truncated

Resolves http://opensimulator.org/mantis/view.php?id=6949
 2014-03-25 09:36:53 +01:00
Justin Clark-Casey (justincc)
f3e177814a Add regression test for http inventory fetch. 
Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
 2014-03-17 20:51:35 +00:00
Melanie
3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
7cab41f422 refactor: replace verbose checks with String.IsNullOrEmpty where applicable. 
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
 2013-11-15 21:45:08 +00:00
teravus
ece2d24077 * Fixes cases where Last Attachment Point gets overwritten with 0 when it 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
 2013-10-05 17:36:58 -05:00
Melanie
75c68fa29e Merge branch 'master' into careminster 
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
 2013-10-04 20:03:12 +01:00
Aleric Inglewood
7889e7757a Don't use 'Indented' formatting for RpcXml responses. 
(cherry picked from commit 93abcde69043b175071e0bb752538d9730433f1d)
 2013-09-22 21:10:01 -05:00
Melanie
a7eb1b5b85 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
 2013-07-24 03:50:09 +01:00
Melanie
7830cc9954 Merge branch 'master' into careminster 
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
 2013-07-18 10:08:10 +01:00
Justin Clark-Casey (justincc)
1b7b664c86 Add request received/handling stats for caps which are served by http poll handlers. 
This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding.
Other refactoring was required to get logic into the right places to support this.
 2013-07-15 23:27:46 +01:00
Diva Canto
b2d4b8b1da BaseHttpServer: if the handler sets the content length, don't override it. This happens in HEAD handlers. 2013-07-08 14:12:11 -07:00
Melanie
f70357eaa3 Merge branch 'master' into careminster 
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
 2013-06-23 01:59:57 +01:00
Justin Clark-Casey (justincc)
84af1cab9b Display existing statistic of how many http requests a server is making as server.network.HTTPRequestsMade in "show stats all" 2013-06-19 20:48:12 +01:00
Justin Clark-Casey (justincc)
9501a583cb Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat 2013-06-18 23:07:18 +01:00
Melanie
a022ee5766 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2013-06-11 01:03:15 +01:00
Justin Clark-Casey (justincc)
32d1e50565 Reinstate explicit starting and stopping of PollServiceRequestManager added in 3eee991 but removed in 7c0bfca 
Do not rely on destructors to stop things.
These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503
and most probably http://opensimulator.org/mantis/view.php?id=6668
 2013-06-10 23:30:35 +01:00
Melanie
7c0bfca7a0 Adding Avination's PollService to round out the HTTP inventory changes 2013-06-07 23:43:45 +01:00
teravus
d2367968e4 * In between the fog, a moment of clarity. This fixes mantis 6570 2013-04-04 19:10:23 -04:00
Melanie
c6b0942f97 Merge branch 'master' into careminster 2013-04-05 00:03:33 +01:00
Melanie
5b950ca36a Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster 2013-03-19 00:54:23 +00:00
teravus
6e1b3f9951 *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a 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. 2013-03-16 03:14:11 -04:00
Melanie
81552f41c6 Merge branch 'master' into careminster 
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
 2013-03-05 23:57:53 +00:00
BlueWall
66d74e76b1 Add method to remove JsonRpc Handlers from the server 2013-03-03 09:40:44 -05:00
Melanie
45f5a6a6db Merge branch 'master' into careminster 
Conflicts:
	bin/HttpServer_OpenSim.dll
 2013-02-07 20:51:51 +00:00
teravus
4867a7cbbf This is the final commit that enables the Websocket handler 2013-02-07 10:27:18 -05:00
teravus
1dc09d8e8f We're not really done here.. but we're getting there. Socket Read is working.. Still have to do Header.ToBytes and compose a websocket frame with a payload. 2013-02-05 18:02:25 -05:00
Melanie
87022b1fb4 Merge branch 'master' into careminster 2013-01-23 19:31:22 +00:00
BlueWall
2841ed05cf Merge branch 'master' of /home/opensim/var/repo/opensim 2013-01-23 08:16:18 -05:00
BlueWall
1776986dc3 Add additional return status 
Adding additional return status for JsonRpcMethod. Now returns true/false
 2013-01-23 08:14:21 -05:00
Melanie
12efac494a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
 2013-01-19 02:38:04 +00:00
Justin Clark-Casey (justincc)
3eee991935 Explicitly stop PollServiceRequestManager() rather than relying on its destructor. 
Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
 2013-01-19 02:04:36 +00:00
Melanie
70fa41863d Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster 2013-01-16 01:13:14 +00:00