[cpp-xmltooling] branch master updated: CPPXT-118 - Address any deprecated CURL options
Scott Cantor
cantor.2 at osu.edu
Tue Jan 16 14:06:39 EST 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-xmltooling.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=7fb3a9ba7dd4e1445d399e46dd20b12b7d83bbd2
The following commit(s) were added to refs/heads/master by this push:
new 7fb3a9b CPPXT-118 - Address any deprecated CURL options
7fb3a9b is described below
commit 7fb3a9ba7dd4e1445d399e46dd20b12b7d83bbd2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 16 14:06:04 2018 -0500
CPPXT-118 - Address any deprecated CURL options
https://issues.shibboleth.net/jira/browse/CPPXT-118
---
.cproject | 4 +++-
.project | 2 ++
config_win32.h | 3 +++
configure.ac | 3 +++
xmltooling/soap/impl/CURLSOAPTransport.cpp | 2 +-
xmltooling/util/CurlURLInputStream.cpp | 4 ++++
6 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.cproject b/.cproject
index 8277c51..581b2a8 100644
--- a/.cproject
+++ b/.cproject
@@ -22,7 +22,7 @@
<folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.478635233." name="/" resourcePath="">
<toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1252920648" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain">
<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.1236666029" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/>
- <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.718692449" keepEnvironmentInBuildfile="false" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
+ <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.718692449" keepEnvironmentInBuildfile="false" name="Autotools Makefile Generator" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.367827426" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure">
<option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.1805489275" name="Name" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.478635233" valueType="string"/>
</tool>
@@ -31,6 +31,7 @@
<option id="gnu.c.compiler.option.include.paths.1938022467" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value=""${workspace_loc:/cpp-log4shib}""/>
<listOptionValue builtIn="false" value="/opt/local/include"/>
+ <listOptionValue builtIn="false" value=""C:\Users\cantor.2\Shibboleth\boost_1_66_0""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.329821576" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
@@ -38,6 +39,7 @@
<option id="gnu.cpp.compiler.option.include.paths.445545987" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value=""${workspace_loc:/cpp-log4shib}""/>
<listOptionValue builtIn="false" value="/opt/local/include"/>
+ <listOptionValue builtIn="false" value=""C:\Users\cantor.2\Shibboleth\boost_1_66_0""/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1689081032" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
diff --git a/.project b/.project
index 6de5244..20c302e 100644
--- a/.project
+++ b/.project
@@ -4,6 +4,8 @@
<comment></comment>
<projects>
<project>cpp-log4shib</project>
+ <project>xerces-trunk</project>
+ <project>xml-security-cpp</project>
</projects>
<buildSpec>
<buildCommand>
diff --git a/config_win32.h b/config_win32.h
index 429763b..d190ba8 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -93,6 +93,9 @@
/* Define to 1 if you have support for the CURLINFO_TLS_SSL_PTR feature. */
#define HAVE_CURLINFO_TLS_SSL_PTR 1
+/* Define to 1 if you have support for the CURLOPT_ACCEPT_ENCODING option. */
+#define HAVE_CURLOPT_ACCEPT_ENCODING 1
+
/* Name of package */
#define PACKAGE "xmltooling"
diff --git a/configure.ac b/configure.ac
index baf60e1..307347b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -309,6 +309,9 @@ int i = 0;
[AC_LANG_PROGRAM([[#include <curl/curl.h>]],
[[curl_global_init(CURL_GLOBAL_ALL)]])],,
[AC_MSG_ERROR([unable to link with libcurl])])
+ AC_MSG_CHECKING([for CURLOPT_ACCEPT_ENCODING in curl.h])
+ AC_EGREP_HEADER([CURLOPT_ACCEPT_ENCODING], [curl/curl.h],
+ [AC_DEFINE([HAVE_CURLOPT_ACCEPT_ENCODING],[1],[Define to 1 if you have support for the CURLOPT_ACCEPT_ENCODING option.])])
AC_MSG_CHECKING([for CURLOPT_SSL_CTX_FUNCTION in curl.h])
AC_EGREP_HEADER([CURLOPT_SSL_CTX_FUNCTION], [curl/curl.h],
[AC_MSG_RESULT(yes)],
diff --git a/xmltooling/soap/impl/CURLSOAPTransport.cpp b/xmltooling/soap/impl/CURLSOAPTransport.cpp
index b7ebe25..2554f20 100644
--- a/xmltooling/soap/impl/CURLSOAPTransport.cpp
+++ b/xmltooling/soap/impl/CURLSOAPTransport.cpp
@@ -506,7 +506,7 @@ void CURLSOAPTransport::send(istream* in)
// Setup standard per-call curl properties.
curl_easy_setopt(m_handle,CURLOPT_DEBUGDATA,&log_curl);
- curl_easy_setopt(m_handle,CURLOPT_FILE,&m_stream);
+ curl_easy_setopt(m_handle,CURLOPT_WRITEDATA,&m_stream);
if (m_chunked && in) {
curl_easy_setopt(m_handle,CURLOPT_POST,1);
m_headers=curl_slist_append(m_headers,"Transfer-Encoding: chunked");
diff --git a/xmltooling/util/CurlURLInputStream.cpp b/xmltooling/util/CurlURLInputStream.cpp
index 2ee76da..24353e1 100644
--- a/xmltooling/util/CurlURLInputStream.cpp
+++ b/xmltooling/util/CurlURLInputStream.cpp
@@ -275,7 +275,11 @@ void CurlURLInputStream::init(const DOMElement* e)
curl_easy_setopt(fEasy, CURLOPT_NOPROGRESS, 1);
curl_easy_setopt(fEasy, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(fEasy, CURLOPT_FAILONERROR, 1);
+#ifdef HAVE_CURLOPT_ACCEPT_ENCODING
+ curl_easy_setopt(fEasy, CURLOPT_ACCEPT_ENCODING, "");
+#else
curl_easy_setopt(fEasy, CURLOPT_ENCODING, "");
+#endif
// Install SSL callback.
curl_easy_setopt(fEasy, CURLOPT_SSL_CTX_FUNCTION, ssl_ctx_callback);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list