Update cpr

Last time this submodule was updated to a tag from 2017, this commit fixes this mistake. It allows removing the include dirs hack as well as a few other workarounds, since this was fixed upstream.

Author: TheAssassin

CMakeLists.txt

@@ -92,6 +92,9 @@ pkg_check_modules(libgcrypt REQUIRED IMPORTED_TARGET libgcrypt)
 
 option(USE_SYSTEM_CPR OFF "Use system-wide installed CPR")
 
+# makes linking to static libraries easier
+option(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 if(USE_SYSTEM_CPR)
     find_package(cpr REQUIRED)
     add_library(cpr ALIAS cpr::cpr)

lib/CMakeLists.txt

@@ -11,11 +11,20 @@ add_subdirectory(libzsync)
 # external dependencies used as submodules
 
 if(NOT USE_SYSTEM_CPR)
+    # for some reason we don't know, cpr wants to build shared libs by default
+    # this is not the default behavior of CMake, so we force this option off again
+    # unfortunately, we have to do this globally...
+    # long term goal is to replace the submodule in some way, e.g., by using prebuilt cpr binaries
+    set(BUILD_SHARED_LIBS OFF)
+
+    # there is no need to build our own libcurl
+    # in fact, building it as a static lib creates a whole circus of problems, and also takes time
+    set(CPR_FORCE_USE_SYSTEM_CURL ON)
+
     add_subdirectory(cpr)
-    set_property(TARGET cpr PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-    # this hack is still needed to make the bundled cpr work, unfortunately
-    target_include_directories(cpr PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/cpr/include)
+    # since we want to have static builds of cpr, we have to enable -fPIC manually
+    set_property(TARGET cpr PROPERTY POSITION_INDEPENDENT_CODE ON)
 endif()
 
 # it's quite simple dealing with the args library directly from CMake

lib/cpr

@@ -282,14 +282,15 @@ namespace zsync2 {
                         bytes << "bytes=" << currentChunk << "-" << currentChunk + chunkSize - 1;
                         session.SetHeader(cpr::Header{{"range", bytes.str()}});
 
-                        session.SetRedirect(false);
+                        session.SetRedirect(cpr::Redirect{0L});
                         auto verificationResponse = session.Get();
 
 //                        bool digestVerified;
 //                        if (!verifyInstanceDigest(verificationResponse, digestVerified))
 //                            return nullptr;
 
-                        session.SetRedirect(true);
+                        // according to the docs, 50 is the default
+                        session.SetRedirect(cpr::Redirect{50L});
                         auto response = session.Get();
 
                         // expect a range response
@@ -305,10 +306,11 @@ namespace zsync2 {
                         currentChunk += chunkSize;
                     }
                 } else {
-                    session.SetRedirect(false);
+                    session.SetRedirect(cpr::Redirect{0L});
                     auto verificationResponse = session.Get();
 
-                    session.SetRedirect(true);
+                    // 50 is the default value according to the docs
+                    session.SetRedirect(cpr::Redirect{50L});
                     auto response = session.Get();
 
                     bool digestVerified;

src/zsclient.cpp

@@ -107,7 +107,7 @@ namespace zsync2 {
     }
 
     bool resolveRedirections(const std::string& absoluteUrl, std::string& redirectedUrl) {
-        auto response = cpr::Head(absoluteUrl);
+        auto response = cpr::Head(cpr::Url{absoluteUrl});
 
         // check for proper response code
         // 4xx and 5xx responses can be considered okay for a redirection resolver, as they're valid responses
@@ -116,7 +116,7 @@ namespace zsync2 {
         if (response.status_code >= 300 && response.status_code < 400)
             return false;
 
-        redirectedUrl = response.url;
+        redirectedUrl = response.url.str();
         return true;
     }
 

src/zsutil.cpp

@@ -5,10 +5,6 @@ include(CTest)
 
 set(CMAKE_CXX_STANDARD 11)
 
-include_directories(../src)
-
-include_directories(${CPR_INCLUDE_DIRS})
-
 add_executable(test_zsutil test_zsutil.cpp)
 target_link_libraries(test_zsutil PRIVATE libzsync2 gtest cpr)
 add_test(NAME test_zsutil COMMAND test_zsutil)