# HG changeset patch # User Alain Mazy # Date 1747723541 -7200 # Node ID d7aadea091f4117ae657957b14b099f42081b2b7 # Parent e391372078f4ef8024de4cca078b25e99385db60 S3: ConnectionTimeout rename diff -r e391372078f4 -r d7aadea091f4 Aws/AwsS3StoragePlugin.cpp --- a/Aws/AwsS3StoragePlugin.cpp Fri Mar 28 16:26:22 2025 +0100 +++ b/Aws/AwsS3StoragePlugin.cpp Tue May 20 08:45:41 2025 +0200 @@ -523,7 +523,9 @@ } const std::string endpoint = pluginSection.GetStringValue("Endpoint", ""); - const unsigned int connectTimeout = pluginSection.GetUnsignedIntegerValue("ConnectTimeout", 30); + const unsigned int connectTimeout = pluginSection.GetUnsignedIntegerValue("ConnectTimeout", 30); // till v 2.5.1 + pluginSection.GetUnsignedIntegerValue("ConnectionTimeout", connectTimeout); // from v 2.5.1+, both ConnectTimeout and ConnectionTimeout are supported + const unsigned int requestTimeout = pluginSection.GetUnsignedIntegerValue("RequestTimeout", 1200); const bool virtualAddressing = pluginSection.GetBooleanValue("VirtualAddressing", true); const bool enableAwsSdkLogs = pluginSection.GetBooleanValue("EnableAwsSdkLogs", false); diff -r e391372078f4 -r d7aadea091f4 NEWS --- a/NEWS Fri Mar 28 16:26:22 2025 +0100 +++ b/NEWS Tue May 20 08:45:41 2025 +0200 @@ -1,3 +1,11 @@ +Pending changes in the mainline +=============================== + +* AWS plugin: + * "ConnectTimeout" has been renamed into "ConnectionTimeout" to match the documentation. + Both names are still accepted. + + 2025-03-28 - v 2.5.1 ====================