ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-30 14:17:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,801 Commits 5 Branches 93 Tags
162dfd8a381999cf5883f4886b9b9aee3a3ad149
Commit Graph

166 Commits

Author SHA1 Message Date
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
BlueWall
ca3e0d67d2 Add Json-Rpc 2.0 To Registered Handlers 
Added registration json-rpc handlers in the http server. Covers version 2.0
  See: http://www.jsonrpc.org/specification
 2013-01-15 10:04:16 -05:00
Melanie
2cb824d3fc Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-12-07 03:49:04 +00:00
Justin Clark-Casey (justincc)
fdf8876e20 In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather than creating a new CultureInfo separately 2012-12-05 21:52:10 +00:00
Melanie
fd7a83f439 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
 2012-11-25 14:13:50 +00:00
Justin Clark-Casey (justincc)
065d6d6fe1 Delete unused BaseHttpServer.HandleAgentRequest() 2012-11-23 04:15:21 +00:00
Melanie
45eedb635a Merge branch 'master' into careminster 2012-11-20 20:25:15 +00:00
Justin Clark-Casey (justincc)
dc5711ad62 minor: If logging full incoming HTTP data, don't deceptively print ... at the end of the body. 2012-11-20 04:10:03 +00:00
Melanie
484eca323b Merge branch 'master' into careminster 2012-10-23 17:25:40 +01:00
Justin Clark-Casey (justincc)
2206132ab9 minor: Get content type handler logger to log "unset" for the content type instead of blank if no content type was set. 2012-10-23 00:44:47 +01:00
Justin Clark-Casey (justincc)
542d075376 minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data where this wasn't already used. 
This allows log level 5 (log sample or large part of incoming post data) to operate and removes copy/paste.
 2012-10-23 00:39:59 +01:00
Justin Clark-Casey (justincc)
991151250d If we're avoiding printing a long request warning for a GetTexture CAP call, check we received a request handler first since this is not guaranteed. 
Resolves harmless logged exception when content type and generic xml rpc requests take more than 3 seconds.
 2012-10-18 00:39:43 +01:00
Melanie
060d6fe8f4 Allow setting max connections for an endpoint 2012-09-30 16:30:16 +01:00
Melanie
71dd55a1ce Merge branch 'master' into careminster 
Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-09-29 19:21:07 +01:00
Justin Clark-Casey (justincc)
f457952755 Fix bug where debug http level 6 could not be specified. Also converts newlines at this level to '\n' to enable them to be logged. 2012-09-29 02:38:21 +01:00
Melanie
001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +01:00
UbitUmarov
617f1b9223 just remove the damm thing 2012-09-26 16:17:49 +01:00
Melanie
bbaf2c5a80 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-24 20:14:00 +01:00
Diva Canto
772aedc731 Make BaseHttpServer throws say something useful. 2012-09-22 14:01:07 -07:00
Justin Clark-Casey (justincc)
1b0abf8f0c Comment out the long unused afaik HTTP agent handlers. 
As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now.  Other similar code uses HTTP or stream handlers instead.
So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway.
If this facility is actually being used then please notify me or uncomment it if you are core.
 2012-09-21 00:29:13 +01:00
Justin Clark-Casey (justincc)
e29d563557 Add request number counting to incoming HTTP requests in the same way that this was already being done for outgoing HTTP requests. 
This allows us to associate debug logging messages with the right request.
It also allows us to put a request number on 'long request' logging even if other debug logging is not enabled, which gives us some idea of whether every request is suffering this problem or only some.
This is a separate internal number not associated with any incoming number in the opensim-request-id header, this will be clarified when logging of this incoming request number is re-enabled.
This commit also adds port number to HTTP IN logging to allow us to distinguish between different request numbers on different ports.
 2012-09-21 00:09:17 +01:00
Justin Clark-Casey (justincc)
a5b3989e5d Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the request took. 
This is only printed if debug http level >= 4 and the request didn't take more than the time considered 'long', in which case the existing log message is printed.
This displaces the previous log levels 4 and 5 which are now 5 and 6 respectively.
 2012-09-20 23:18:19 +01:00
Justin Clark-Casey (justincc)
387a1bb283 Add ability to turn on/off logging of outgoing HTTP requests flowing through WebUtil. 
This is for debugging purposes.
This is controlled via the "debug http" command which can already log incoming requests.
This now gains a mandatory parameter of in, out or all to control what is logged.
Log messages are also shortened and labelled and HTTP IN or HTTP OUT to be consistent with existing UDP PACKET IN and PACKET OUT messages.
 2012-09-20 23:17:44 +01:00
Melanie
a97436f2f1 Catch a nullref in the code to suppress GetTexture warnign spam we can't 
do a thing about anyway.
 2012-09-16 16:42:30 +02:00
Melanie
66bf1376b5 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
 2012-09-16 04:21:18 +01:00
Melanie
db774d4292 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
 2012-09-16 04:11:20 +01:00
Melanie
2aa7a22129 Sequence/throttle asset retrievals. 2012-09-14 23:09:07 +02:00
Melanie
387e59ff7f Revamp the HTTP textures handler to allow a maximum of four fetches 
at any time and to drop requests for avatars n longer in the scene
 2012-09-14 21:24:25 +02:00
Melanie
52d74cf274 Allow setting max connections for an endpoint 2012-09-14 00:11:23 +02:00
Justin Clark-Casey (justincc)
7df7b86ec5 Fix bug in logging sample input at debug http level 4. 
Also converts newlines to "\n" text.
 2012-09-12 23:01:07 +01:00
Justin Clark-Casey (justincc)
25111e703f Add levels 4 and 5 to "debug http" console command that will log a sample of incoming request data and the entire incoming data respectively. 
See "help debug http" for more details.
 2012-09-11 21:48:51 +01:00
UbitUmarov
a7250c6ea1 add a extra httppool thread to compensate for webfetchinventory 2012-09-10 01:23:20 +01:00
Melanie
771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00