diff options
author | Dan Lake | 2011-11-23 16:41:30 -0800 |
---|---|---|
committer | Dan Lake | 2011-11-23 16:41:30 -0800 |
commit | 89b2fb2ff491b97cdfa17b9b8a596dea77567b76 (patch) | |
tree | 36bdc61ac4920af8f53e345633dd1853197a13fb | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
download | opensim-SC-89b2fb2ff491b97cdfa17b9b8a596dea77567b76.zip opensim-SC-89b2fb2ff491b97cdfa17b9b8a596dea77567b76.tar.gz opensim-SC-89b2fb2ff491b97cdfa17b9b8a596dea77567b76.tar.bz2 opensim-SC-89b2fb2ff491b97cdfa17b9b8a596dea77567b76.tar.xz |
Append asset ID to URL for storage requests to allow caching proxies to work with Simian
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index d8089ac..9573e21 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -334,7 +334,9 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
334 | // Make the remote storage request | 334 | // Make the remote storage request |
335 | try | 335 | try |
336 | { | 336 | { |
337 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl); | 337 | // Simian does not require the asset ID to be in the URL because it's in the post data. |
338 | // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs | ||
339 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString()); | ||
338 | 340 | ||
339 | HttpWebResponse response = MultipartForm.Post(request, postParameters); | 341 | HttpWebResponse response = MultipartForm.Post(request, postParameters); |
340 | using (Stream responseStream = response.GetResponseStream()) | 342 | using (Stream responseStream = response.GetResponseStream()) |