diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-13 07:53:10 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-13 07:53:10 +0000 |
| commit | 3ac22b097d9a9e829ec45963a7c3a40dd12b40a1 (patch) | |
| tree | ae26d54d061b8f61a1ee2513aa913e8a5e3a1277 /sca-cpp/trunk/modules/http/http.hpp | |
| parent | 1b5f778e514d74d86eee83932b9d5948d7e6e316 (diff) | |
Port to HTTPD 2.3.8. Add an auth module to make OpenID, OAuth 1/2 and HTTPD 2.3 Form auth modules play nice together.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1034693 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/http.hpp')
| -rw-r--r-- | sca-cpp/trunk/modules/http/http.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sca-cpp/trunk/modules/http/http.hpp b/sca-cpp/trunk/modules/http/http.hpp index db860aeee2..56331d7ee2 100644 --- a/sca-cpp/trunk/modules/http/http.hpp +++ b/sca-cpp/trunk/modules/http/http.hpp @@ -159,19 +159,19 @@ const failable<CURL*> setup(const string& url, const CURLSession& cs) { // Setup SSL options if (cs.ca != "") { - debug(cs.ca, "http::apply::ca"); + debug(cs.ca, "http::setup::ca"); curl_easy_setopt(ch, CURLOPT_CAINFO, c_str(cs.ca)); curl_easy_setopt(ch, CURLOPT_SSL_VERIFYPEER, true); curl_easy_setopt(ch, CURLOPT_SSL_VERIFYHOST, 2); } else curl_easy_setopt(ch, CURLOPT_SSL_VERIFYPEER, false); if (cs.cert != "") { - debug(cs.cert, "http::apply::cert"); + debug(cs.cert, "http::setup::cert"); curl_easy_setopt(ch, CURLOPT_SSLCERT, c_str(cs.cert)); curl_easy_setopt(ch, CURLOPT_SSLCERTTYPE, "PEM"); } if (cs.key != "") { - debug(cs.key, "http::apply::key"); + debug(cs.key, "http::setup::key"); curl_easy_setopt(ch, CURLOPT_SSLKEY, c_str(cs.key)); curl_easy_setopt(ch, CURLOPT_SSLKEYTYPE, "PEM"); } @@ -238,6 +238,8 @@ curl_slist* headers(curl_slist* cl, const list<string>& h) { } template<typename R> const failable<list<R> > apply(const list<list<string> >& hdr, const lambda<R(const string&, const R)>& reduce, const R& initial, const string& url, const string& verb, const CURLSession& cs) { + debug(url, "http::apply::url"); + debug(verb, "http::apply::verb"); // Setup the CURL session const failable<CURL*> fch = setup(url, cs); @@ -523,6 +525,7 @@ apr_pollfd_t* pollfd(apr_socket_t* s, const int e, const gc_pool& p) { * Connect to a URL. */ const failable<bool> connect(const string& url, CURLSession& cs) { + debug(url, "http::connect::url"); // Setup the CURL session const failable<CURL*> fch = setup(url, cs); |