diff options
Diffstat (limited to 'OpenSim/Capabilities/Handlers')
4 files changed, 256 insertions, 116 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs index 720640e..ec574a3 100644 --- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs | |||
@@ -45,16 +45,54 @@ namespace OpenSim.Capabilities.Handlers | |||
45 | { | 45 | { |
46 | public class GetMeshHandler | 46 | public class GetMeshHandler |
47 | { | 47 | { |
48 | // private static readonly ILog m_log = | 48 | private static readonly ILog m_log = |
49 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 50 | ||
51 | private IAssetService m_assetService; | 51 | private IAssetService m_assetService; |
52 | 52 | ||
53 | public const string DefaultFormat = "vnd.ll.mesh"; | ||
54 | |||
53 | public GetMeshHandler(IAssetService assService) | 55 | public GetMeshHandler(IAssetService assService) |
54 | { | 56 | { |
55 | m_assetService = assService; | 57 | m_assetService = assService; |
56 | } | 58 | } |
59 | public Hashtable Handle(Hashtable request) | ||
60 | { | ||
61 | Hashtable ret = new Hashtable(); | ||
62 | ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound; | ||
63 | ret["content_type"] = "text/plain"; | ||
64 | ret["keepalive"] = false; | ||
65 | ret["reusecontext"] = false; | ||
66 | ret["int_bytes"] = 0; | ||
67 | ret["int_lod"] = 0; | ||
68 | string MeshStr = (string)request["mesh_id"]; | ||
69 | |||
70 | |||
71 | //m_log.DebugFormat("[GETMESH]: called {0}", MeshStr); | ||
72 | |||
73 | if (m_assetService == null) | ||
74 | { | ||
75 | m_log.Error("[GETMESH]: Cannot fetch mesh " + MeshStr + " without an asset service"); | ||
76 | } | ||
77 | |||
78 | UUID meshID; | ||
79 | if (!String.IsNullOrEmpty(MeshStr) && UUID.TryParse(MeshStr, out meshID)) | ||
80 | { | ||
81 | // m_log.DebugFormat("[GETMESH]: Received request for mesh id {0}", meshID); | ||
57 | 82 | ||
83 | |||
84 | ret = ProcessGetMesh(request, UUID.Zero, null); | ||
85 | |||
86 | |||
87 | } | ||
88 | else | ||
89 | { | ||
90 | m_log.Warn("[GETMESH]: Failed to parse a mesh_id from GetMesh request: " + (string)request["uri"]); | ||
91 | } | ||
92 | |||
93 | |||
94 | return ret; | ||
95 | } | ||
58 | public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap) | 96 | public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap) |
59 | { | 97 | { |
60 | Hashtable responsedata = new Hashtable(); | 98 | Hashtable responsedata = new Hashtable(); |
@@ -62,6 +100,9 @@ namespace OpenSim.Capabilities.Handlers | |||
62 | responsedata["content_type"] = "text/plain"; | 100 | responsedata["content_type"] = "text/plain"; |
63 | responsedata["keepalive"] = false; | 101 | responsedata["keepalive"] = false; |
64 | responsedata["str_response_string"] = "Request wasn't what was expected"; | 102 | responsedata["str_response_string"] = "Request wasn't what was expected"; |
103 | responsedata["reusecontext"] = false; | ||
104 | responsedata["int_lod"] = 0; | ||
105 | responsedata["int_bytes"] = 0; | ||
65 | 106 | ||
66 | string meshStr = string.Empty; | 107 | string meshStr = string.Empty; |
67 | 108 | ||
@@ -77,6 +118,7 @@ namespace OpenSim.Capabilities.Handlers | |||
77 | responsedata["content_type"] = "text/plain"; | 118 | responsedata["content_type"] = "text/plain"; |
78 | responsedata["keepalive"] = false; | 119 | responsedata["keepalive"] = false; |
79 | responsedata["str_response_string"] = "The asset service is unavailable. So is your mesh."; | 120 | responsedata["str_response_string"] = "The asset service is unavailable. So is your mesh."; |
121 | responsedata["reusecontext"] = false; | ||
80 | return responsedata; | 122 | return responsedata; |
81 | } | 123 | } |
82 | 124 | ||
@@ -86,9 +128,100 @@ namespace OpenSim.Capabilities.Handlers | |||
86 | { | 128 | { |
87 | if (mesh.Type == (SByte)AssetType.Mesh) | 129 | if (mesh.Type == (SByte)AssetType.Mesh) |
88 | { | 130 | { |
89 | responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); | 131 | |
90 | responsedata["content_type"] = "application/vnd.ll.mesh"; | 132 | Hashtable headers = new Hashtable(); |
91 | responsedata["int_response_code"] = 200; | 133 | responsedata["headers"] = headers; |
134 | |||
135 | string range = String.Empty; | ||
136 | |||
137 | if (((Hashtable)request["headers"])["range"] != null) | ||
138 | range = (string)((Hashtable)request["headers"])["range"]; | ||
139 | |||
140 | else if (((Hashtable)request["headers"])["Range"] != null) | ||
141 | range = (string)((Hashtable)request["headers"])["Range"]; | ||
142 | |||
143 | if (!String.IsNullOrEmpty(range)) // Mesh Asset LOD // Physics | ||
144 | { | ||
145 | // Range request | ||
146 | int start, end; | ||
147 | if (TryParseRange(range, out start, out end)) | ||
148 | { | ||
149 | // Before clamping start make sure we can satisfy it in order to avoid | ||
150 | // sending back the last byte instead of an error status | ||
151 | if (start >= mesh.Data.Length) | ||
152 | { | ||
153 | responsedata["int_response_code"] = 404; //501; //410; //404; | ||
154 | responsedata["content_type"] = "text/plain"; | ||
155 | responsedata["keepalive"] = false; | ||
156 | responsedata["str_response_string"] = "This range doesnt exist."; | ||
157 | responsedata["reusecontext"] = false; | ||
158 | responsedata["int_lod"] = 3; | ||
159 | return responsedata; | ||
160 | } | ||
161 | else | ||
162 | { | ||
163 | end = Utils.Clamp(end, 0, mesh.Data.Length - 1); | ||
164 | start = Utils.Clamp(start, 0, end); | ||
165 | int len = end - start + 1; | ||
166 | |||
167 | //m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID); | ||
168 | |||
169 | if (start > 20000) | ||
170 | { | ||
171 | responsedata["int_lod"] = 3; | ||
172 | } | ||
173 | else if (start < 4097) | ||
174 | { | ||
175 | responsedata["int_lod"] = 1; | ||
176 | } | ||
177 | else | ||
178 | { | ||
179 | responsedata["int_lod"] = 2; | ||
180 | } | ||
181 | |||
182 | |||
183 | if (start == 0 && len == mesh.Data.Length) // well redudante maybe | ||
184 | { | ||
185 | responsedata["int_response_code"] = (int) System.Net.HttpStatusCode.OK; | ||
186 | responsedata["bin_response_data"] = mesh.Data; | ||
187 | responsedata["int_bytes"] = mesh.Data.Length; | ||
188 | responsedata["reusecontext"] = false; | ||
189 | responsedata["int_lod"] = 3; | ||
190 | |||
191 | } | ||
192 | else | ||
193 | { | ||
194 | responsedata["int_response_code"] = | ||
195 | (int) System.Net.HttpStatusCode.PartialContent; | ||
196 | headers["Content-Range"] = String.Format("bytes {0}-{1}/{2}", start, end, | ||
197 | mesh.Data.Length); | ||
198 | |||
199 | byte[] d = new byte[len]; | ||
200 | Array.Copy(mesh.Data, start, d, 0, len); | ||
201 | responsedata["bin_response_data"] = d; | ||
202 | responsedata["int_bytes"] = len; | ||
203 | responsedata["reusecontext"] = false; | ||
204 | } | ||
205 | } | ||
206 | } | ||
207 | else | ||
208 | { | ||
209 | m_log.Warn("[GETMESH]: Failed to parse a range from GetMesh request, sending full asset: " + (string)request["uri"]); | ||
210 | responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); | ||
211 | responsedata["content_type"] = "application/vnd.ll.mesh"; | ||
212 | responsedata["int_response_code"] = 200; | ||
213 | responsedata["reusecontext"] = false; | ||
214 | responsedata["int_lod"] = 3; | ||
215 | } | ||
216 | } | ||
217 | else | ||
218 | { | ||
219 | responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); | ||
220 | responsedata["content_type"] = "application/vnd.ll.mesh"; | ||
221 | responsedata["int_response_code"] = 200; | ||
222 | responsedata["reusecontext"] = false; | ||
223 | responsedata["int_lod"] = 3; | ||
224 | } | ||
92 | } | 225 | } |
93 | // Optionally add additional mesh types here | 226 | // Optionally add additional mesh types here |
94 | else | 227 | else |
@@ -97,6 +230,8 @@ namespace OpenSim.Capabilities.Handlers | |||
97 | responsedata["content_type"] = "text/plain"; | 230 | responsedata["content_type"] = "text/plain"; |
98 | responsedata["keepalive"] = false; | 231 | responsedata["keepalive"] = false; |
99 | responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh."; | 232 | responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh."; |
233 | responsedata["reusecontext"] = false; | ||
234 | responsedata["int_lod"] = 1; | ||
100 | return responsedata; | 235 | return responsedata; |
101 | } | 236 | } |
102 | } | 237 | } |
@@ -106,11 +241,28 @@ namespace OpenSim.Capabilities.Handlers | |||
106 | responsedata["content_type"] = "text/plain"; | 241 | responsedata["content_type"] = "text/plain"; |
107 | responsedata["keepalive"] = false; | 242 | responsedata["keepalive"] = false; |
108 | responsedata["str_response_string"] = "Your Mesh wasn't found. Sorry!"; | 243 | responsedata["str_response_string"] = "Your Mesh wasn't found. Sorry!"; |
244 | responsedata["reusecontext"] = false; | ||
245 | responsedata["int_lod"] = 0; | ||
109 | return responsedata; | 246 | return responsedata; |
110 | } | 247 | } |
111 | } | 248 | } |
112 | 249 | ||
113 | return responsedata; | 250 | return responsedata; |
114 | } | 251 | } |
252 | private bool TryParseRange(string header, out int start, out int end) | ||
253 | { | ||
254 | if (header.StartsWith("bytes=")) | ||
255 | { | ||
256 | string[] rangeValues = header.Substring(6).Split('-'); | ||
257 | if (rangeValues.Length == 2) | ||
258 | { | ||
259 | if (Int32.TryParse(rangeValues[0], out start) && Int32.TryParse(rangeValues[1], out end)) | ||
260 | return true; | ||
261 | } | ||
262 | } | ||
263 | |||
264 | start = end = 0; | ||
265 | return false; | ||
266 | } | ||
115 | } | 267 | } |
116 | } \ No newline at end of file | 268 | } \ No newline at end of file |
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index 04cc33a..6437d0b 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
@@ -47,36 +47,36 @@ using Caps = OpenSim.Framework.Capabilities.Caps; | |||
47 | 47 | ||
48 | namespace OpenSim.Capabilities.Handlers | 48 | namespace OpenSim.Capabilities.Handlers |
49 | { | 49 | { |
50 | public class GetTextureHandler : BaseStreamHandler | 50 | public class GetTextureHandler |
51 | { | 51 | { |
52 | private static readonly ILog m_log = | 52 | private static readonly ILog m_log = |
53 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 53 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
54 | |||
54 | private IAssetService m_assetService; | 55 | private IAssetService m_assetService; |
55 | 56 | ||
56 | public const string DefaultFormat = "x-j2c"; | 57 | public const string DefaultFormat = "x-j2c"; |
57 | 58 | ||
58 | // TODO: Change this to a config option | 59 | public GetTextureHandler(IAssetService assService) |
59 | const string REDIRECT_URL = null; | ||
60 | |||
61 | public GetTextureHandler(string path, IAssetService assService, string name, string description) | ||
62 | : base("GET", path, name, description) | ||
63 | { | 60 | { |
64 | m_assetService = assService; | 61 | m_assetService = assService; |
65 | } | 62 | } |
66 | 63 | ||
67 | public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 64 | public Hashtable Handle(Hashtable request) |
68 | { | 65 | { |
69 | // Try to parse the texture ID from the request URL | 66 | Hashtable ret = new Hashtable(); |
70 | NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); | 67 | ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound; |
71 | string textureStr = query.GetOne("texture_id"); | 68 | ret["content_type"] = "text/plain"; |
72 | string format = query.GetOne("format"); | 69 | ret["keepalive"] = false; |
70 | ret["reusecontext"] = false; | ||
71 | ret["int_bytes"] = 0; | ||
72 | string textureStr = (string)request["texture_id"]; | ||
73 | string format = (string)request["format"]; | ||
73 | 74 | ||
74 | //m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr); | 75 | //m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr); |
75 | 76 | ||
76 | if (m_assetService == null) | 77 | if (m_assetService == null) |
77 | { | 78 | { |
78 | m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service"); | 79 | m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service"); |
79 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; | ||
80 | } | 80 | } |
81 | 81 | ||
82 | UUID textureID; | 82 | UUID textureID; |
@@ -91,30 +91,30 @@ namespace OpenSim.Capabilities.Handlers | |||
91 | } | 91 | } |
92 | else | 92 | else |
93 | { | 93 | { |
94 | formats = WebUtil.GetPreferredImageTypes(httpRequest.Headers.Get("Accept")); | 94 | formats = new string[1] { DefaultFormat }; // default |
95 | if (((Hashtable)request["headers"])["Accept"] != null) | ||
96 | formats = WebUtil.GetPreferredImageTypes((string)((Hashtable)request["headers"])["Accept"]); | ||
95 | if (formats.Length == 0) | 97 | if (formats.Length == 0) |
96 | formats = new string[1] { DefaultFormat }; // default | 98 | formats = new string[1] { DefaultFormat }; // default |
97 | 99 | ||
98 | } | 100 | } |
99 | // OK, we have an array with preferred formats, possibly with only one entry | 101 | // OK, we have an array with preferred formats, possibly with only one entry |
100 | 102 | ||
101 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; | ||
102 | foreach (string f in formats) | 103 | foreach (string f in formats) |
103 | { | 104 | { |
104 | if (FetchTexture(httpRequest, httpResponse, textureID, f)) | 105 | if (FetchTexture(request, ret, textureID, f)) |
105 | break; | 106 | break; |
106 | } | 107 | } |
107 | } | 108 | } |
108 | else | 109 | else |
109 | { | 110 | { |
110 | m_log.Warn("[GETTEXTURE]: Failed to parse a texture_id from GetTexture request: " + httpRequest.Url); | 111 | m_log.Warn("[GETTEXTURE]: Failed to parse a texture_id from GetTexture request: " + (string)request["uri"]); |
111 | } | 112 | } |
112 | 113 | ||
113 | // m_log.DebugFormat( | 114 | // m_log.DebugFormat( |
114 | // "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}", | 115 | // "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}", |
115 | // textureID, httpResponse.StatusCode, httpResponse.ContentLength); | 116 | // textureID, httpResponse.StatusCode, httpResponse.ContentLength); |
116 | 117 | return ret; | |
117 | return null; | ||
118 | } | 118 | } |
119 | 119 | ||
120 | /// <summary> | 120 | /// <summary> |
@@ -125,7 +125,7 @@ namespace OpenSim.Capabilities.Handlers | |||
125 | /// <param name="textureID"></param> | 125 | /// <param name="textureID"></param> |
126 | /// <param name="format"></param> | 126 | /// <param name="format"></param> |
127 | /// <returns>False for "caller try another codec"; true otherwise</returns> | 127 | /// <returns>False for "caller try another codec"; true otherwise</returns> |
128 | private bool FetchTexture(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, UUID textureID, string format) | 128 | private bool FetchTexture(Hashtable request, Hashtable response, UUID textureID, string format) |
129 | { | 129 | { |
130 | // m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format); | 130 | // m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format); |
131 | AssetBase texture; | 131 | AssetBase texture; |
@@ -134,84 +134,65 @@ namespace OpenSim.Capabilities.Handlers | |||
134 | if (format != DefaultFormat) | 134 | if (format != DefaultFormat) |
135 | fullID = fullID + "-" + format; | 135 | fullID = fullID + "-" + format; |
136 | 136 | ||
137 | if (!String.IsNullOrEmpty(REDIRECT_URL)) | 137 | // try the cache |
138 | texture = m_assetService.GetCached(fullID); | ||
139 | |||
140 | if (texture == null) | ||
138 | { | 141 | { |
139 | // Only try to fetch locally cached textures. Misses are redirected | 142 | //m_log.DebugFormat("[GETTEXTURE]: texture was not in the cache"); |
140 | texture = m_assetService.GetCached(fullID); | 143 | |
144 | // Fetch locally or remotely. Misses return a 404 | ||
145 | texture = m_assetService.Get(textureID.ToString()); | ||
141 | 146 | ||
142 | if (texture != null) | 147 | if (texture != null) |
143 | { | 148 | { |
144 | if (texture.Type != (sbyte)AssetType.Texture) | 149 | if (texture.Type != (sbyte)AssetType.Texture) |
150 | return true; | ||
151 | |||
152 | if (format == DefaultFormat) | ||
145 | { | 153 | { |
146 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; | 154 | WriteTextureData(request, response, texture, format); |
147 | return true; | 155 | return true; |
148 | } | 156 | } |
149 | WriteTextureData(httpRequest, httpResponse, texture, format); | 157 | else |
150 | } | ||
151 | else | ||
152 | { | ||
153 | string textureUrl = REDIRECT_URL + textureID.ToString(); | ||
154 | m_log.Debug("[GETTEXTURE]: Redirecting texture request to " + textureUrl); | ||
155 | httpResponse.RedirectLocation = textureUrl; | ||
156 | return true; | ||
157 | } | ||
158 | } | ||
159 | else // no redirect | ||
160 | { | ||
161 | // try the cache | ||
162 | texture = m_assetService.GetCached(fullID); | ||
163 | |||
164 | if (texture == null) | ||
165 | { | ||
166 | // m_log.DebugFormat("[GETTEXTURE]: texture was not in the cache"); | ||
167 | |||
168 | // Fetch locally or remotely. Misses return a 404 | ||
169 | texture = m_assetService.Get(textureID.ToString()); | ||
170 | |||
171 | if (texture != null) | ||
172 | { | 158 | { |
173 | if (texture.Type != (sbyte)AssetType.Texture) | 159 | AssetBase newTexture = new AssetBase(texture.ID + "-" + format, texture.Name, (sbyte)AssetType.Texture, texture.Metadata.CreatorID); |
174 | { | 160 | newTexture.Data = ConvertTextureData(texture, format); |
175 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; | 161 | if (newTexture.Data.Length == 0) |
176 | return true; | 162 | return false; // !!! Caller try another codec, please! |
177 | } | 163 | |
178 | if (format == DefaultFormat) | 164 | newTexture.Flags = AssetFlags.Collectable; |
179 | { | 165 | newTexture.Temporary = true; |
180 | WriteTextureData(httpRequest, httpResponse, texture, format); | 166 | m_assetService.Store(newTexture); |
181 | return true; | 167 | WriteTextureData(request, response, newTexture, format); |
182 | } | 168 | return true; |
183 | else | ||
184 | { | ||
185 | AssetBase newTexture = new AssetBase(texture.ID + "-" + format, texture.Name, (sbyte)AssetType.Texture, texture.Metadata.CreatorID); | ||
186 | newTexture.Data = ConvertTextureData(texture, format); | ||
187 | if (newTexture.Data.Length == 0) | ||
188 | return false; // !!! Caller try another codec, please! | ||
189 | |||
190 | newTexture.Flags = AssetFlags.Collectable; | ||
191 | newTexture.Temporary = true; | ||
192 | m_assetService.Store(newTexture); | ||
193 | WriteTextureData(httpRequest, httpResponse, newTexture, format); | ||
194 | return true; | ||
195 | } | ||
196 | } | 169 | } |
197 | } | 170 | } |
198 | else // it was on the cache | 171 | } |
199 | { | 172 | else // it was on the cache |
200 | // m_log.DebugFormat("[GETTEXTURE]: texture was in the cache"); | 173 | { |
201 | WriteTextureData(httpRequest, httpResponse, texture, format); | 174 | //m_log.DebugFormat("[GETTEXTURE]: texture was in the cache"); |
202 | return true; | 175 | WriteTextureData(request, response, texture, format); |
203 | } | 176 | return true; |
204 | } | 177 | } |
205 | 178 | ||
206 | // not found | 179 | // not found |
207 | // m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found"); | 180 | // m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found"); |
208 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; | ||
209 | return true; | 181 | return true; |
210 | } | 182 | } |
211 | 183 | ||
212 | private void WriteTextureData(IOSHttpRequest request, IOSHttpResponse response, AssetBase texture, string format) | 184 | private void WriteTextureData(Hashtable request, Hashtable response, AssetBase texture, string format) |
213 | { | 185 | { |
214 | string range = request.Headers.GetOne("Range"); | 186 | Hashtable headers = new Hashtable(); |
187 | response["headers"] = headers; | ||
188 | |||
189 | string range = String.Empty; | ||
190 | |||
191 | if (((Hashtable)request["headers"])["range"] != null) | ||
192 | range = (string)((Hashtable)request["headers"])["range"]; | ||
193 | |||
194 | else if (((Hashtable)request["headers"])["Range"] != null) | ||
195 | range = (string)((Hashtable)request["headers"])["Range"]; | ||
215 | 196 | ||
216 | if (!String.IsNullOrEmpty(range)) // JP2's only | 197 | if (!String.IsNullOrEmpty(range)) // JP2's only |
217 | { | 198 | { |
@@ -239,10 +220,8 @@ namespace OpenSim.Capabilities.Handlers | |||
239 | // However, if we return PartialContent (or OK) instead, the viewer will display that resolution. | 220 | // However, if we return PartialContent (or OK) instead, the viewer will display that resolution. |
240 | 221 | ||
241 | // response.StatusCode = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable; | 222 | // response.StatusCode = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable; |
242 | // response.AddHeader("Content-Range", String.Format("bytes */{0}", texture.Data.Length)); | 223 | // viewers don't seem to handle RequestedRangeNotSatisfiable and keep retrying with same parameters |
243 | // response.StatusCode = (int)System.Net.HttpStatusCode.OK; | 224 | response["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound; |
244 | response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent; | ||
245 | response.ContentType = texture.Metadata.ContentType; | ||
246 | } | 225 | } |
247 | else | 226 | else |
248 | { | 227 | { |
@@ -252,41 +231,46 @@ namespace OpenSim.Capabilities.Handlers | |||
252 | 231 | ||
253 | // m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID); | 232 | // m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID); |
254 | 233 | ||
255 | // Always return PartialContent, even if the range covered the entire data length | 234 | response["content-type"] = texture.Metadata.ContentType; |
256 | // We were accidentally sending back 404 before in this situation | 235 | |
257 | // https://issues.apache.org/bugzilla/show_bug.cgi?id=51878 supports sending 206 even if the | 236 | if (start == 0 && len == texture.Data.Length) // well redudante maybe |
258 | // entire range is requested, and viewer 3.2.2 (and very probably earlier) seems fine with this. | 237 | { |
259 | // | 238 | response["int_response_code"] = (int)System.Net.HttpStatusCode.OK; |
260 | // We also do not want to send back OK even if the whole range was satisfiable since this causes | 239 | response["bin_response_data"] = texture.Data; |
261 | // HTTP textures on at least Imprudence 1.4.0-beta2 to never display the final texture quality. | 240 | response["int_bytes"] = texture.Data.Length; |
262 | // if (end > maxEnd) | 241 | } |
263 | // response.StatusCode = (int)System.Net.HttpStatusCode.OK; | 242 | else |
264 | // else | 243 | { |
265 | response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent; | 244 | response["int_response_code"] = (int)System.Net.HttpStatusCode.PartialContent; |
266 | 245 | headers["Content-Range"] = String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length); | |
267 | response.ContentLength = len; | 246 | |
268 | response.ContentType = texture.Metadata.ContentType; | 247 | byte[] d = new byte[len]; |
269 | response.AddHeader("Content-Range", String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length)); | 248 | Array.Copy(texture.Data, start, d, 0, len); |
270 | 249 | response["bin_response_data"] = d; | |
271 | response.Body.Write(texture.Data, start, len); | 250 | response["int_bytes"] = len; |
251 | } | ||
252 | // response.Body.Write(texture.Data, start, len); | ||
272 | } | 253 | } |
273 | } | 254 | } |
274 | else | 255 | else |
275 | { | 256 | { |
276 | m_log.Warn("[GETTEXTURE]: Malformed Range header: " + range); | 257 | m_log.Warn("[GETTEXTURE]: Malformed Range header: " + range); |
277 | response.StatusCode = (int)System.Net.HttpStatusCode.BadRequest; | 258 | response["int_response_code"] = (int)System.Net.HttpStatusCode.BadRequest; |
278 | } | 259 | } |
279 | } | 260 | } |
280 | else // JP2's or other formats | 261 | else // JP2's or other formats |
281 | { | 262 | { |
282 | // Full content request | 263 | // Full content request |
283 | response.StatusCode = (int)System.Net.HttpStatusCode.OK; | 264 | response["int_response_code"] = (int)System.Net.HttpStatusCode.OK; |
284 | response.ContentLength = texture.Data.Length; | ||
285 | if (format == DefaultFormat) | 265 | if (format == DefaultFormat) |
286 | response.ContentType = texture.Metadata.ContentType; | 266 | response["content_type"] = texture.Metadata.ContentType; |
287 | else | 267 | else |
288 | response.ContentType = "image/" + format; | 268 | response["content_type"] = "image/" + format; |
289 | response.Body.Write(texture.Data, 0, texture.Data.Length); | 269 | |
270 | response["bin_response_data"] = texture.Data; | ||
271 | response["int_bytes"] = texture.Data.Length; | ||
272 | |||
273 | // response.Body.Write(texture.Data, 0, texture.Data.Length); | ||
290 | } | 274 | } |
291 | 275 | ||
292 | // if (response.StatusCode < 200 || response.StatusCode > 299) | 276 | // if (response.StatusCode < 200 || response.StatusCode > 299) |
@@ -390,4 +374,4 @@ namespace OpenSim.Capabilities.Handlers | |||
390 | return null; | 374 | return null; |
391 | } | 375 | } |
392 | } | 376 | } |
393 | } \ No newline at end of file | 377 | } |
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs index 71cf033..bf66acb 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs | |||
@@ -33,6 +33,7 @@ using OpenSim.Framework.Servers.HttpServer; | |||
33 | using OpenSim.Server.Handlers.Base; | 33 | using OpenSim.Server.Handlers.Base; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | 35 | ||
36 | /* | ||
36 | namespace OpenSim.Capabilities.Handlers | 37 | namespace OpenSim.Capabilities.Handlers |
37 | { | 38 | { |
38 | public class GetTextureServerConnector : ServiceConnector | 39 | public class GetTextureServerConnector : ServiceConnector |
@@ -63,7 +64,8 @@ namespace OpenSim.Capabilities.Handlers | |||
63 | throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName)); | 64 | throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName)); |
64 | 65 | ||
65 | server.AddStreamHandler( | 66 | server.AddStreamHandler( |
66 | new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService, "GetTexture", null)); | 67 | new GetTextureHandler("/CAPS/GetTexture/", m_AssetService, "GetTexture", null)); |
67 | } | 68 | } |
68 | } | 69 | } |
69 | } \ No newline at end of file | 70 | } |
71 | */ | ||
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs index d4d6d10..217a265 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs | |||
@@ -39,6 +39,7 @@ using OpenSim.Region.Framework.Scenes; | |||
39 | using OpenSim.Tests.Common; | 39 | using OpenSim.Tests.Common; |
40 | using OpenSim.Tests.Common.Mock; | 40 | using OpenSim.Tests.Common.Mock; |
41 | 41 | ||
42 | /* | ||
42 | namespace OpenSim.Capabilities.Handlers.GetTexture.Tests | 43 | namespace OpenSim.Capabilities.Handlers.GetTexture.Tests |
43 | { | 44 | { |
44 | [TestFixture] | 45 | [TestFixture] |
@@ -60,4 +61,5 @@ namespace OpenSim.Capabilities.Handlers.GetTexture.Tests | |||
60 | Assert.That(resp.StatusCode, Is.EqualTo((int)System.Net.HttpStatusCode.NotFound)); | 61 | Assert.That(resp.StatusCode, Is.EqualTo((int)System.Net.HttpStatusCode.NotFound)); |
61 | } | 62 | } |
62 | } | 63 | } |
63 | } \ No newline at end of file | 64 | } |
65 | */ | ||