Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set conncode in carddav/carddav-sslverify.cpp to have the default value of CURLE_OK.
[xestiaab/.git]
/
source
/
carddav
/
carddav-sslverify.cpp
diff --git
a/source/carddav/carddav-sslverify.cpp
b/source/carddav/carddav-sslverify.cpp
index
3c34641
..
ac861b0
100644
(file)
--- a/
source/carddav/carddav-sslverify.cpp
+++ b/
source/carddav/carddav-sslverify.cpp
@@
-41,7
+41,7
@@
CURLcode CardDAV::SSLVerifyTest(){
CURL *conn;
CURL *connssldata;
CURL *conn;
CURL *connssldata;
- CURLcode conncode;
+ CURLcode conncode
= CURLE_OK
;
wxString ServerAddressURL;
wxString ServerAuth;
wxString ServerAddressSSL;
wxString ServerAddressURL;
wxString ServerAuth;
wxString ServerAddressSSL;
@@
-74,6
+74,12
@@
CURLcode CardDAV::SSLVerifyTest(){
curl_easy_setopt(conn, CURLOPT_WRITEDATA, &PageData);
curl_easy_setopt(conn, CURLOPT_WRITEHEADER, &PageHeader);
curl_easy_setopt(conn, CURLOPT_WRITEDATA, &PageData);
curl_easy_setopt(conn, CURLOPT_WRITEHEADER, &PageHeader);
+#if defined(__APPLE__) || defined(__WIN32__)
+
+ SetConnectionObject(conn);
+
+#endif
+
conncode = (curl_easy_perform(conn));
// Check if the SSL certificate is valid or self-signed or some other
conncode = (curl_easy_perform(conn));
// Check if the SSL certificate is valid or self-signed or some other
@@
-101,10
+107,18
@@
CURLcode CardDAV::SSLVerifyTest(){
curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYPEER, 0L);
curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYHOST, 0L);
curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYPEER, 0L);
curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYHOST, 0L);
+#if defined(__APPLE__) || defined(__WIN32__)
+
+ SetConnectionObject(connssldata);
+
+#endif
+
CURLcode certfetchcode;
certfetchcode = (curl_easy_perform(connssldata));
CURLcode certfetchcode;
certfetchcode = (curl_easy_perform(connssldata));
+#if !defined(__APPLE__) && !defined(__WIN32__)
+
VerifyCertCollection = BuildSSLCollection(connssldata);
if (certfetchcode == CURLE_OK){
VerifyCertCollection = BuildSSLCollection(connssldata);
if (certfetchcode == CURLE_OK){
@@
-119,6
+133,8
@@
CURLcode CardDAV::SSLVerifyTest(){
}
}
+#endif
+
*ServerResult = FALSE;
} else {
*ServerResult = FALSE;
} else {
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy