diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-08-09 20:52:17 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-09 20:54:44 +0200 |
| commit | 8d3a4fa775a23371aed58bbbab1d5a7537df5110 (patch) | |
| tree | d4eac04a6cd676f829b564db73ced2c53cd266ab /external | |
| parent | 4a764319cbad4e2589cc105145ac27defbf49ff6 (diff) | |
Revert "libcmis: configure curl to only allow redirects to HTTP/HTTPS"
This reverts commit e845507bc22a166ec172a4b4d9da120a16f8a964.
Actually this is already set by HttpSession::initProtocols(),
and SharePointSession is a sub-class of HttpSession.
Change-Id: Ie24cc0c6fcf45195ae4aceafb3da1b0d0ea3c9e6
Diffstat (limited to 'external')
| -rw-r--r-- | external/libcmis/UnpackedTarball_cmis.mk | 1 | ||||
| -rw-r--r-- | external/libcmis/libcmis-curl-redirects.patch.1 | 24 |
2 files changed, 0 insertions, 25 deletions
diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk index a993e9fc111e..a29b1e7cd6f8 100644 --- a/external/libcmis/UnpackedTarball_cmis.mk +++ b/external/libcmis/UnpackedTarball_cmis.mk @@ -20,7 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \ external/libcmis/libcmis-fix-google-drive-2.patch \ external/libcmis/libcmis-sharepoint-repository-root.patch \ external/libcmis/libcmis-fix-error-handling.patch \ - external/libcmis/libcmis-curl-redirects.patch.1 \ )) ifeq ($(OS),WNT) diff --git a/external/libcmis/libcmis-curl-redirects.patch.1 b/external/libcmis/libcmis-curl-redirects.patch.1 deleted file mode 100644 index a429598543dc..000000000000 --- a/external/libcmis/libcmis-curl-redirects.patch.1 +++ /dev/null @@ -1,24 +0,0 @@ -configure curl to only allow redirects to HTTP/HTTPS - ---- cmis/src/libcmis/http-session.cxx.orig 2017-08-09 17:39:11.686928636 +0200 -+++ cmis/src/libcmis/http-session.cxx 2017-08-09 17:40:10.398933383 +0200 -@@ -525,6 +525,8 @@ - { - // Redirect - curl_easy_setopt( m_curlHandle, CURLOPT_FOLLOWLOCATION, redirect); -+ // only allow redirect to http:// and https:// -+ curl_easy_setopt(m_curlHandle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); - - // Activate the cookie engine - curl_easy_setopt( m_curlHandle, CURLOPT_COOKIEFILE, "" ); ---- cmis/src/libcmis/sharepoint-session.cxx.orig 2017-08-09 17:39:19.974929306 +0200 -+++ cmis/src/libcmis/sharepoint-session.cxx 2017-08-09 17:39:42.500931127 +0200 -@@ -204,6 +204,8 @@ - { - // Redirect - curl_easy_setopt( m_curlHandle, CURLOPT_FOLLOWLOCATION, redirect); -+ // only allow redirect to http:// and https:// -+ curl_easy_setopt(m_curlHandle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); - - // Activate the cookie engine - curl_easy_setopt( m_curlHandle, CURLOPT_COOKIEFILE, "" ); |