SeanOMik
/
znc-push
mirror of https://github.com/SeanOMik/znc-push.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add debug option when using libcurl

This commit is contained in:
John Reese 2013-11-14 12:08:35 -08:00
parent 77ce3e8c1a
commit 6ed1610ebd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
push.cpp
View File

@ -75,7 +75,7 @@ class CPushSocket : public CSocket
// forward declaration // forward declaration
CURLcode make_curl_request(const CString& service_host, const CString& service_url, CURLcode make_curl_request(const CString& service_host, const CString& service_url,
const CString& service_auth, MCString& params, int port, const CString& service_auth, MCString& params, int port,
bool use_ssl, bool use_post); bool use_ssl, bool use_post, bool debug);
#endif // USE_CURL #endif // USE_CURL
/** /**
@ -463,7 +463,7 @@ class CPushMod : public CModule
} }
#ifdef USE_CURL #ifdef USE_CURL
make_curl_request(service_host, service_url, service_auth, params, use_port, use_ssl, use_post); make_curl_request(service_host, service_url, service_auth, params, use_port, use_ssl, use_post, options["debug"] == "on");
#else #else
// Create the socket connection, write to it, and add it to the queue // Create the socket connection, write to it, and add it to the queue
CPushSocket *sock = new CPushSocket(this); CPushSocket *sock = new CPushSocket(this);
@ -1406,7 +1406,7 @@ class CPushMod : public CModule
} }
#ifdef USE_CURL #ifdef USE_CURL
make_curl_request(service_host, service_url, service_auth, params, use_port, use_ssl, use_post); make_curl_request(service_host, service_url, service_auth, params, use_port, use_ssl, use_post, options["debug"] == "on");
#else #else
// Create the socket connection, write to it, and add it to the queue // Create the socket connection, write to it, and add it to the queue
CPushSocket *sock = new CPushSocket(this); CPushSocket *sock = new CPushSocket(this);
@ -1493,7 +1493,7 @@ CString build_query_string(MCString& params)
*/ */
CURLcode make_curl_request(const CString& service_host, const CString& service_url, CURLcode make_curl_request(const CString& service_host, const CString& service_url,
const CString& service_auth, MCString& params, int port, const CString& service_auth, MCString& params, int port,
bool use_ssl, bool use_post) bool use_ssl, bool use_post, bool debug)
{ {
CURL *curl; CURL *curl;
CURLcode result; CURLcode result;
@ -1503,6 +1503,11 @@ CURLcode make_curl_request(const CString& service_host, const CString& service_u
CString url = CString(use_ssl ? "https" : "http") + "://" + service_host + service_url; CString url = CString(use_ssl ? "https" : "http") + "://" + service_host + service_url;
CString query = build_query_string(params); CString query = build_query_string(params);
if (debug)
{
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
}
curl_easy_setopt(curl, CURLOPT_URL, url.data()); curl_easy_setopt(curl, CURLOPT_URL, url.data());
curl_easy_setopt(curl, CURLOPT_PORT, port); curl_easy_setopt(curl, CURLOPT_PORT, port);
curl_easy_setopt(curl, CURLOPT_USERAGENT, "ZNC Push"); curl_easy_setopt(curl, CURLOPT_USERAGENT, "ZNC Push");