svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release

1 files changed, 39 insertions, 0 deletions

diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp
index 7cb6f5f95a..bca4e2364d 100644
--- a/indra/llmessage/llhttpassetstorage.cpp
+++ b/indra/llmessage/llhttpassetstorage.cpp
@@ -14,6 +14,7 @@
 #include <sys/stat.h>
 
 #include "indra_constants.h"
+#include "message.h"
 #include "llvfile.h"
 #include "llvfs.h"
 
@@ -497,6 +498,8 @@ void LLHTTPAssetStorage::storeAssetData(
 			callback(LLUUID::null, user_data, LL_ERR_CANNOT_OPEN_FILE);
 		}
 	}
+	// Coverity CID-269 says there's a leak of 'legacy' here, but
+	// legacyStoreDataCallback() will delete it somewhere down the line.
 }
 
 // virtual
@@ -917,9 +920,45 @@ void LLHTTPAssetStorage::checkForTimeouts()
 	} while (curl_msg && queue_length > 0);
 	
 
+	// Cleanup 
+	// We want to bump to the back of the line any running uploads that have timed out.
+	bumpTimedOutUploads();
+
 	LLAssetStorage::checkForTimeouts();
 }
 
+void LLHTTPAssetStorage::bumpTimedOutUploads()
+{
+	// No point bumping currently running uploads if there are no others in line.
+	if (!(mPendingUploads.size() > mRunningUploads.size())) 
+	{
+		return;
+	}
+
+	F64 mt_secs = LLMessageSystem::getMessageTimeSeconds();
+
+	// deletePendingRequest will modify the mRunningUploads list so we don't want to iterate over it.
+	request_list_t temp_running = mRunningUploads;
+
+	request_list_t::iterator it = temp_running.begin();
+	request_list_t::iterator end = temp_running.end();
+	for ( ; it != end; ++it)
+	{
+		//request_list_t::iterator curiter = iter++;
+		LLAssetRequest* req = *it;
+
+		if ( LL_ASSET_STORAGE_TIMEOUT < (mt_secs - req->mTime) )
+		{
+			llwarns << "Asset upload request timed out for "
+					<< req->getUUID() << "."
+					<< LLAssetType::lookup(req->getType()) 
+					<< ", bumping to the back of the line!" << llendl;
+
+			deletePendingRequest(RT_UPLOAD, req->getType(), req->getUUID());
+		}
+	}
+}
+
 // static
 size_t LLHTTPAssetStorage::curlDownCallback(void *data, size_t size, size_t nmemb, void *user_data)
 {