Imported Upstream version 2.6.0p2

[debian/amanda] / device-src / s3.c

diff --git a/device-src/s3.c b/device-src/s3.c
index 161ff4ea7a017b4a294052765c7f61f4d7e81efd..dfd29dc42200762e642211cfe486fef10f27a77d 100644 (file)
--- a/device-src/s3.c
+++ b/device-src/s3.c
@@ -70,12 +70,6 @@
  * (*excluding* null terminator) */
 #define S3_MAX_KEY_LENGTH 1024
 
-#if defined(LIBCURL_FEATURE_SSL) && defined(LIBCURL_PROTOCOL_HTTPS)
-# define S3_URL "https://s3.amazonaws.com"
-#else
-# define S3_URL "http://s3.amazonaws.com"
-#endif
-
 #define AMAZON_SECURITY_HEADER "x-amz-security-token"
 
 /* parameters for exponential backoff in the face of retriable errors */
@@ -159,6 +153,13 @@ s3_error_code_from_name(char *s3_error_name);
 static const char *
 s3_error_name_from_code(s3_error_code_t s3_error_code);
 
+/* Does this install of curl support SSL?
+ *
+ * @returns: boolean
+ */
+static gboolean
+s3_curl_supports_ssl(void);
+
 /*
  * result handling */
 
@@ -321,6 +322,28 @@ s3_error_name_from_code(s3_error_code_t s3_error_code)
 }
 /* }}} */
 
+/* {{{ s3_curl_supports_ssl */
+static gboolean
+s3_curl_supports_ssl(void)
+{
+    static int supported = -1;
+
+    if (supported == -1) {
+#if defined(CURL_VERSION_SSL)
+       curl_version_info_data *info = curl_version_info(CURLVERSION_NOW);
+       if (info->features & CURL_VERSION_SSL)
+           supported = 1;
+       else
+           supported = 0;
+#else
+       supported = 0;
+#endif
+    }
+
+    return supported;
+}
+/* }}} */
+
 /* {{{ lookup_result */
 static s3_result_t
 lookup_result(const result_handling_t *result_handling,
@@ -660,6 +683,7 @@ perform_request(S3Handle *hdl,
                 guint preallocate_response_size,
                 const result_handling_t *result_handling)
 {
+    const char *baseurl;
     char *url = NULL;
     s3_result_t result = S3_RESULT_FAIL; /* assume the worst.. */
     CURLcode curl_code = CURLE_OK;
@@ -675,7 +699,8 @@ perform_request(S3Handle *hdl,
 
     s3_reset(hdl);
 
-    url = g_strconcat(S3_URL, uri, NULL);
+    baseurl = s3_curl_supports_ssl()? "https://s3.amazonaws.com":"http://s3.amazonaws.com";
+    url = g_strconcat(baseurl, uri, NULL);
     if (!url) goto cleanup;
 
     if (preallocate_response_size) {