summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3559c66)
raw | patch | inline | side by side (parent: 3559c66)
author | Frank Cornelis <info@e-contract.be> | |
Fri, 22 Nov 2013 11:38:54 +0000 (12:38 +0100) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Mon, 3 Mar 2014 15:02:58 +0000 (16:02 +0100) |
src/curl.c | patch | blob | history | |
src/curl_json.c | patch | blob | history | |
src/curl_xml.c | patch | blob | history |
diff --git a/src/curl.c b/src/curl.c
index 2e1a583e5c50a1fe49f44a0865b6da2cc7d2856a..e189df6b5591fcd4f0c0835ae028aa8057d0630e 100644 (file)
--- a/src/curl.c
+++ b/src/curl.c
curl_easy_setopt (wp->curl, CURLOPT_USERPWD, wp->credentials);
if (wp->digest)
- {
- curl_easy_setopt (wp->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
- curl_easy_setopt (wp->curl, CURLOPT_USERNAME, wp->user);
- curl_easy_setopt (wp->curl, CURLOPT_PASSWORD, wp->pass);
- }
+ {
+ curl_easy_setopt (wp->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+ curl_easy_setopt (wp->curl, CURLOPT_USERNAME, wp->user);
+ curl_easy_setopt (wp->curl, CURLOPT_PASSWORD, wp->pass);
+ }
}
curl_easy_setopt (wp->curl, CURLOPT_SSL_VERIFYPEER, (long) wp->verify_peer);
diff --git a/src/curl_json.c b/src/curl_json.c
index 35461d34cdd04eca21f365274dc372f8e592f25f..a9db92501af819a56ccc5a2d7a603a81883a203e 100644 (file)
--- a/src/curl_json.c
+++ b/src/curl_json.c
curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials);
if (db->digest)
- {
- curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
- curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
- curl_easy_setopt (db->curl, CURLOPT_PASSWORD, db->pass);
- }
+ {
+ curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+ curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
+ curl_easy_setopt (db->curl, CURLOPT_PASSWORD, db->pass);
+ }
}
curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, (long) db->verify_peer);
else if (db->url && strcasecmp ("Password", child->key) == 0)
status = cf_util_get_string (child, &db->pass);
else if (strcasecmp ("Digest", child->key) == 0)
- status = cf_util_get_boolean (child, &db->digest);
+ status = cf_util_get_boolean (child, &db->digest);
else if (db->url && strcasecmp ("VerifyPeer", child->key) == 0)
status = cf_util_get_boolean (child, &db->verify_peer);
else if (db->url && strcasecmp ("VerifyHost", child->key) == 0)
diff --git a/src/curl_xml.c b/src/curl_xml.c
index ba24ffd945831d0a47f8e5bdf4abab920fe7958c..6d36d29dd2172178757d81ec37efcfa23c882577 100644 (file)
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials);
if (db->digest)
- {
- curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
- curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
- curl_easy_setopt (db->curl, CURLOPT_PASSWORD, db->pass);
- }
+ {
+ curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+ curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
+ curl_easy_setopt (db->curl, CURLOPT_PASSWORD, db->pass);
+ }
}
curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, db->verify_peer ? 1L : 0L);