UbitUmarov
713c222ec8
remove some redundancy
2020-05-11 15:12:21 +01:00
UbitUmarov
c99014991b
cosmetics
2020-04-09 13:41:41 +01:00
UbitUmarov
fe9df55410
nissing files
2020-04-02 21:52:31 +01:00
UbitUmarov
b783244a50
move http range parser to util
2018-11-30 23:10:29 +00:00
UbitUmarov
6ea394467d
if viewer asks for range reply in same format even if its full data
2018-11-06 15:09:49 +00:00
UbitUmarov
f17b48e73e
some cleanup
2018-07-14 14:22:52 +01:00
UbitUmarov
0341b46279
Merge branch 'master' into httptests
2018-03-10 20:51:38 +00:00
UbitUmarov
a0d0d65c70
mantis 7885: robust asset services have no cache and only accept a asset ID that is a uuid, so regions hack to cache several image formats is not possible. Robut GetTexture is very heavy unless image format is the default (j2k mime type x-j2k), since with no cache image convertions is performed on every request. Adicionally it does expose all textures if the tcp port is public. Avoid using it.
2018-03-10 20:50:24 +00:00
UbitUmarov
49b4408782
some cleanup
2018-01-20 12:11:07 +00:00
UbitUmarov
ae191cd304
dispose some MemoryStreams
2017-05-06 15:57:47 +01:00
Melanie Thielker
b16abc8166
Massive tab and trailing space cleanup
2017-01-05 19:07:37 +00:00
UbitUmarov
65b4e17a80
robust textures add missing returns or redir case
2016-12-26 19:38:13 +00:00
UbitUmarov
52a80f1742
workaround potencial memory leak
2016-08-22 05:47:19 +01:00
UbitUmarov
36426b0db2
remove some compile warnings increasing total number by 2
2015-11-21 00:49:43 +00:00
Diva Canto
721db9418f
Fixed Robust-bound GetTexture handler that had been knocked off with the new sim-bound handler that uses a Poll service. Rather than hammering both handlers into one single class, I'm splitting them into 2 classes, because they are considerably different.
2015-10-14 14:41:28 -07: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
018d855f28
turn off KeepAlive
2015-08-24 07:38:33 +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
Justin Clark-Casey (justincc)
fc878a33ed
refactor: consistently put all test classes in the OpenSim.Tests.Common package rather than some in OpenSim.Tests.Common.Mock
...
the separate mock package was not useful and was just another using line to always add
2014-11-25 23:21:37 +00:00
Justin Clark-Casey (justincc)
56a623ac0c
Fix issue with TestTextureNotFound in previous commit 1e3027a
...
Stop failure by actually giving the test handler a path instead of null
2014-07-26 01:56:42 +01:00
root
1a9c14b041
Revert "Removed unused files: Texture/Mesh server connectors"
...
This reverts commit f6ea5088f4
.
2014-07-21 21:25:48 +00:00
Oren Hurvitz
f6ea5088f4
Removed unused files: Texture/Mesh server connectors
2014-07-21 08:30:23 +01:00
Diva Canto
afb938e579
Fix test breakage
2014-05-08 11:30:45 -07:00
Diva Canto
a31393ba0b
Make the URL for texture redirects match the path of the resource that we use in OpenSim.
2014-05-08 11:18:17 -07:00
Diva Canto
a845c1a893
Finished implementing redirects in GetTexture.
2014-05-07 19:38:33 -07: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
Justin Clark-Casey (justincc)
e19defde36
Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap
...
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
2013-07-08 22:03:07 +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
Mic Bowman
57141e34bf
Remove Temporary from use to shortcut asset stores. The Local property
...
differentiates between local & grid storage. The Temporary property just
says that which service handles the it, the asset can be safely removed
in the future.
2013-06-10 13:26:19 -07:00
Melanie
fc1c77b42d
Merge branch 'avination' into careminster
2013-01-23 19:31:27 +00:00
teravus
be60c0b010
* A better way to handle the last fix (This is in case the viewer provides a list of preferred formats, though, technically, the sim would pick the first provided format the old way). This just makes it more obvious what's happening.
2013-01-21 22:08:51 -05:00
teravus
89676b8a48
* The fallthrough of FetchTexture was no longer resulting in a 404 response on missing textures. It was just waiting and no event was being provided. This re-enables the 404 response.
2013-01-21 21:32:48 -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)
68daeee434
minor: change method doc on GetTextureHandler.TryParseRange(), mainly to trigger another build
2012-12-06 01:36:30 +00:00
Justin Clark-Casey (justincc)
acc01bb85d
Allow GetTexture calls with no second value in the range header (e.g. just 5333-)
...
It looks like the latest Kokua is doing this.
As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html , leaving off the second value is legal
This indicates the caller wants the rest of the entity.
2012-12-06 01:12:12 +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)
22d4c52ffc
Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests
2012-11-24 03:15:24 +00:00
Melanie
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
teravus
b7b96a5e4f
Another step in the chain. Pipe the throttle update to the appropriate PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator.
...
Next step is hooking it up to HasEvents
2012-11-05 13:10:00 -05:00
Justin Clark-Casey (justincc)
3af2095cbc
minor: Comment out "Client requested range for texture ... but" message. This is not useful during normal operation.
2012-10-12 00:27:12 +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
a70352db17
don't send a partial contents report if we are sending all data
2012-09-26 21:03:31 +01:00
UbitUmarov
9a04269644
fix GetTextureHandler range
2012-09-26 16:49:39 +01:00
Melanie
66bf1376b5
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
2012-09-16 04:21:18 +01: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
924df14c5e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
Justin Clark-Casey (justincc)
a0d0c9f751
If the GetTexture capability receives a request for a range of data beyond that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable.
...
This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests.
This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size.
I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank.
If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution.
However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
2012-09-06 00:11:47 +01:00
Melanie
26d89777d8
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00