diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-06 14:24:14 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-06 19:46:31 +0100 |
| commit | 385aae6595fa467c73b6fdede5153d785c3ce138 (patch) | |
| tree | f42f13f022d57ea0af7399b730a92849d6f5aff3 | |
| parent | 35925357f86e01612df28a092d71b6e216195636 (diff) | |
libcmis: fix regression in HttpSession::initProtocols()
Change-Id: I1d884945cc1f88a3abbf87c78227b56abf865c16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158999
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch | 31 | ||||
| -rw-r--r-- | external/libcmis/UnpackedTarball_libcmis.mk | 4 |
2 files changed, 35 insertions, 0 deletions
diff --git a/external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch b/external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch new file mode 100644 index 000000000000..8480913cdf20 --- /dev/null +++ b/external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch @@ -0,0 +1,31 @@ +From 5b9ed18e518a5214b4a1fb2766627c1d169b8d8c Mon Sep 17 00:00:00 2001 +From: Michael Stahl <michael.stahl@allotropia.de> +Date: Mon, 6 Nov 2023 13:33:05 +0100 +Subject: [PATCH 1/2] fix regression in HttpSession::initProtocols() + +(regression from commit 1b8a646b1d63bfa760d154dd7e51f6298d4a9899) +--- + src/libcmis/http-session.cxx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/libcmis/http-session.cxx b/src/libcmis/http-session.cxx +index 3847a2c..9703427 100644 +--- a/src/libcmis/http-session.cxx ++++ b/src/libcmis/http-session.cxx +@@ -894,11 +894,12 @@ catch ( const libcmis::Exception& e ) + + void HttpSession::initProtocols( ) + { +- const unsigned long protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS; + #if (LIBCURL_VERSION_MAJOR > 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 85) ++ auto const protocols = "https,http"; + curl_easy_setopt(m_curlHandle, CURLOPT_PROTOCOLS_STR, protocols); + curl_easy_setopt(m_curlHandle, CURLOPT_REDIR_PROTOCOLS_STR, protocols); + #else ++ const unsigned long protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS; + curl_easy_setopt(m_curlHandle, CURLOPT_PROTOCOLS, protocols); + curl_easy_setopt(m_curlHandle, CURLOPT_REDIR_PROTOCOLS, protocols); + #endif +-- +2.41.0 + diff --git a/external/libcmis/UnpackedTarball_libcmis.mk b/external/libcmis/UnpackedTarball_libcmis.mk index 1c014d963401..d7ecc207f10d 100644 --- a/external/libcmis/UnpackedTarball_libcmis.mk +++ b/external/libcmis/UnpackedTarball_libcmis.mk @@ -13,4 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libcmis,$(LIBCMIS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libcmis,1)) +$(eval $(call gb_UnpackedTarball_add_patches,libcmis,\ + external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch \ +)) + # vim: set noet sw=4 ts=4: |