lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,710 Commits 5 Branches 12,734 Tags
6386fdcda774beacbbdf34c1472bbfe0090b00d8
Commit Graph

43 Commits

Author SHA1 Message Date
Melanie
43128c9016 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-01-14 06:09:19 +00:00
Justin Clark-Casey (justincc)
b5bb559cc0 Register the UrlModule for script engine events OnScriptRemoved and OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. 
Doing this in every script is unnecessary since the event trigger is parameterized by the item id.
All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException.
Registration moved to UrlModule so that the handler is registered for all script engine implementations.
This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
 2012-01-14 00:23:11 +00:00
Melanie
50aa89dae6 Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-12-08 03:24:25 +00:00
Justin Clark-Casey (justincc)
e6272b8d56 Stop also adding an ordinary http handler when we set up a poll http handler. 
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
 2011-12-07 12:28:42 +00:00
Melanie
fd22159d0c Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Framework/Watchdog.cs
 2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc)
8a0a78cbcc Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around. 
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this.  This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
 2011-10-25 20:24:21 +01:00
Tom
b000d9ba72 Some additional protection, it seems that responsedata needs to be locked, but I can't immediately see where it's being accessed from another thread. For now, this will protect the server 2011-05-26 03:42:01 -07:00
Tom
1f17960e67 Also fix the locking of url.requests and tidy the locks in general 2011-05-17 18:56:55 -07:00
Tom
e847d1d83f Lock m_requestMap properly to prevent some nasty access errors and the resulting downward spiral 2011-05-17 18:44:07 -07:00
Melanie
b451cc1ebb Merge branch 'master' into careminster-presence-refactor 2011-05-08 20:23:06 +01:00
BlueWall
e4e95706d5 Add support for llRequestSecureURL() if ssl is enabled 2011-05-05 19:57:10 -04:00
Tom
4d4765aa28 Since we've plugged the leak, now increase URLs to 5000 since the limit is being hit in several sims 2011-03-21 13:30:53 -07:00
Tom
9a9c9644ac Repair x-query-string 2011-02-03 17:25:55 -08:00
Tom
e5ef993f2b Fix cm/15627 : Don't block the entire URL on duplicate requests, just that particular request! 2011-01-31 18:01:53 -08:00
Tom
188bdfc878 Ignore duplicate llHTTPResponse calls to the same request. Prevents response corruption. Only the first llHTTPResponse call is obeyed, akin to SL. 2011-01-29 12:45:53 -08:00
Tom
87ed39c953 Significantly increase the total number of URL's available. In second life, the limit is 15,000 URL's (one per prim), so i'd hope we can manage 1k. 2011-01-28 16:51:35 -08:00
Tom
13d4fedf7a Fix a discrepancy vs. SL with parsing x-query-string 2011-01-28 13:45:27 -08:00
Melanie Thielker
86a82e6ecb Now, fix the slash issue the right way. Our URLs now work like SL's 2010-07-03 08:33:08 +02:00
Melanie Thielker
721d8a7298 Re-add the slashes at the end of the URL. Too much depends on them 2010-07-03 07:09:27 +02:00
Melanie Thielker
3d5d44279b ANother stab at LSL compatibility 2010-07-01 17:06:29 +02:00
Melanie Thielker
d5cbe4cb75 Remove trailing slash from HTTP URLs to be compatible with SL 2010-07-01 16:40:26 +02:00
Melanie
cfca9e1e81 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:20:13 +00:00
Revolution
ec3c31e61e Updates all IRegionModules to the new style region modules. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-23 15:18:52 +00:00
John Hurliman
494a1e922d Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet 2009-10-09 02:10:53 -07:00
Justin Clark-Casey (justincc)
730458be1f minor: remove some mono compiler warnings 2009-09-25 14:31:29 +01:00
Diva Canto
ffd30b8ac3 Moved RegionName from RegionInfo to SimpleRegionInfo. 2009-09-22 14:46:05 -07:00
Melanie
97c18caa76 Thank you, Intari, for a patch that implements the missing pieces of 
Http-in and makes the host name for URL generation configurable.
Applied with changes:
llGetSimulatorHostname was not changed, because the change breaks
existing behavior and carries a data exposure risk. That value needs
to be configurable, the proposed fixed change is not acceptable.
 2009-09-22 17:04:34 +01:00
Melanie
eba23048ca Replace the Replaceable modules name 2009-08-10 23:08:22 +01:00
Justin Clark-Casey
190bdc8a2e * Remove some mono compiler warnings 2009-08-05 17:33:23 +01:00
Jeff Ames
a133e83f3a Formatting cleanup. 2009-07-23 15:32:11 +00:00
Melanie Thielker
4b84bdb77e Thank you, patnad, for a patch to advance the UrlModule's functionality. 
Mantis #3712
 2009-07-22 22:16:37 +00:00
Melanie Thielker
8ecfc9a717 Committing the interface change and the addition to the modules to get 
the ball rolling on replacable modules. No user functionality yet
 2009-07-10 20:17:13 +00:00
Melanie Thielker
c310fb11f4 Remove all references to HttpServer from CommsManager (all incarnations) 
Change all uses of the HttpServer properties to use the new singleton
 2009-07-10 02:22:26 +00:00
Jeff Ames
840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00
Melanie Thielker
0b9076cd17 Revert a change I made to get a better URL because it failes under mono 2009-05-26 01:38:32 +00:00
Melanie Thielker
2f74a7e3a6 Couple of tweaks to the URL module: handle script reset gracefully and 
stop crashing http server threads.
 2009-05-26 01:27:22 +00:00
Jeff Ames
e0bc5c5db2 Add copyright headers, formatting cleanup. 2009-05-20 01:32:06 +00:00
Melanie Thielker
13298fef0b Fix up some URL details 2009-05-13 20:57:26 +00:00
Melanie Thielker
8bea196b5b Add the port to the generated URL. For some reson this still doesn't want to 
receive requests.
 2009-05-13 20:45:28 +00:00
Melanie Thielker
fb3d5770dd Make the LSL HTTP server create and give out URLs to scripts 2009-05-13 20:32:14 +00:00
Melanie Thielker
1196f3eac7 Add most of the meat to the LSL HTTP server 2009-05-13 04:04:26 +00:00
Melanie Thielker
ba8850f254 Plumb request and return URL functions. 
Implements llRequestURL, llRequestSecureURL, llReleaseURL
 2009-05-13 03:09:30 +00:00
Melanie Thielker
80ce08d8b2 Add a skeleton for the LSLHttpServer 2009-05-13 02:54:13 +00:00