add option "kCurlHttp_FollowLocation"

ZEISS · Nov 15, 2023 · 31026ee · 31026ee
1 parent fac8eff
commit 31026ee
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/Src/CZICmd/cmdlineoptions.cpp b/Src/CZICmd/cmdlineoptions.cpp
@@ -2194,6 +2194,8 @@ void CCmdLineOptions::PrintHelpStreamsObjects()
         {"CurlHttp_Cookie", libCZI::StreamsFactory::StreamProperties::kCurlHttp_Cookie, libCZI::StreamsFactory::Property::Type::String},
         {"CurlHttp_SslVerifyPeer", libCZI::StreamsFactory::StreamProperties::kCurlHttp_SslVerifyPeer, libCZI::StreamsFactory::Property::Type::Boolean},
         {"CurlHttp_SslVerifyHost", libCZI::StreamsFactory::StreamProperties::kCurlHttp_SslVerifyHost, libCZI::StreamsFactory::Property::Type::Boolean},
+        {"CurlHttp_FollowLocation", libCZI::StreamsFactory::StreamProperties::kCurlHttp_FollowLocation, libCZI::StreamsFactory::Property::Type::Boolean},
+        {"CurlHttp_MaxRedirs", libCZI::StreamsFactory::StreamProperties::kCurlHttp_MaxRedirs, libCZI::StreamsFactory::Property::Type::Int32},
     };
 
     rapidjson::Document document;

diff --git a/Src/libCZI/StreamsLib/curlhttpinputstream.cpp b/Src/libCZI/StreamsLib/curlhttpinputstream.cpp
@@ -159,11 +159,18 @@ CurlHttpInputStream::CurlHttpInputStream(const std::string& url, const std::map<
         ThrowIfCurlSetOptError(return_code, "CURLOPT_SSL_VERIFYPEER");
     }
 
-    property = property_bag.find(StreamsFactory::StreamProperties::kCurlHttp_SslVerifyHost);
+    property = property_bag.find(StreamsFactory::StreamProperties::kCurlHttp_FollowLocation);
     if (property != property_bag.end())
     {
-        return_code = curl_easy_setopt(up_curl_handle.get(), CURLOPT_SSL_VERIFYHOST, property->second.GetAsBoolOrThrow() ? 1L : 0L);
-        ThrowIfCurlSetOptError(return_code, "CURLOPT_SSL_VERIFYHOST");
+        return_code = curl_easy_setopt(up_curl_handle.get(), CURLOPT_FOLLOWLOCATION, property->second.GetAsBoolOrThrow() ? 1L : 0L);
+        ThrowIfCurlSetOptError(return_code, "CURLOPT_FOLLOWLOCATION");
+    }
+
+    property = property_bag.find(StreamsFactory::StreamProperties::kCurlHttp_MaxRedirs);
+    if (property != property_bag.end())
+    {
+        return_code = curl_easy_setopt(up_curl_handle.get(), CURLOPT_MAXREDIRS, property->second.GetAsInt32OrThrow());
+        ThrowIfCurlSetOptError(return_code, "CURLOPT_MAXREDIRS");
     }
 
     this->curl_handle_ = up_curl_handle.release();

diff --git a/Src/libCZI/libCZI_StreamsLib.h b/Src/libCZI/libCZI_StreamsLib.h
@@ -224,6 +224,10 @@ namespace libCZI
                 kCurlHttp_SslVerifyPeer = 106, ///< For CurlHttpInputStream, type bool: a boolean indicating whether the SSL-certificate of the remote host is to be verified, c.f. https://curl.se/libcurl/c/CURLOPT_SSL_VERIFYPEER.html for more information.
 
                 kCurlHttp_SslVerifyHost = 107, ///< For CurlHttpInputStream, type bool: a boolean indicating whether the SSL-certificate's name is to be verified against host, c.f. https://curl.se/libcurl/c/CURLOPT_SSL_VERIFYHOST.html for more information.
+
+                kCurlHttp_FollowLocation = 108, ///< For CurlHttpInputStream, type bool: a boolean indicating whether redirects are to be followed, c.f. https://curl.se/libcurl/c/CURLOPT_FOLLOWLOCATION.html for more information.
+
+                kCurlHttp_MaxRedirs = 109, ///< For CurlHttpInputStream, type int32: gives the maximum number of redirects to follow, c.f. https://curl.se/libcurl/c/CURLOPT_MAXREDIRS.html for more information.
             };
         };