From 89b2fb2ff491b97cdfa17b9b8a596dea77567b76 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Wed, 23 Nov 2011 16:41:30 -0800
Subject: Append asset ID to URL for storage requests to allow caching proxies
 to work with Simian

---
 OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

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
             // Make the remote storage request
             try
             {
-                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
+                // Simian does not require the asset ID to be in the URL because it's in the post data.
+                // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs
+                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString());
                 
                 HttpWebResponse response = MultipartForm.Post(request, postParameters);
                 using (Stream responseStream = response.GetResponseStream())
-- 
cgit v1.1