Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e1f4d1b
)
Added #defined(__APPLE__) around SetConnectionObject in the CardDAV object.
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Tue, 12 Apr 2016 19:37:33 +0000
(20:37 +0100)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Tue, 12 Apr 2016 19:37:33 +0000
(20:37 +0100)
source/carddav/carddav-connect.cpp
patch
|
blob
|
history
source/carddav/carddav-contactlist.cpp
patch
|
blob
|
history
source/carddav/carddav-defaultadrurl.cpp
patch
|
blob
|
history
source/carddav/carddav-processdata.cpp
patch
|
blob
|
history
source/carddav/carddav-servercontact.cpp
patch
|
blob
|
history
source/carddav/carddav-serveretag.cpp
patch
|
blob
|
history
source/carddav/carddav-sslverify.cpp
patch
|
blob
|
history
diff --git
a/source/carddav/carddav-connect.cpp
b/source/carddav/carddav-connect.cpp
index
71134e7
..
3674e9a
100644
(file)
--- a/
source/carddav/carddav-connect.cpp
+++ b/
source/carddav/carddav-connect.cpp
@@
-131,8
+131,12
@@
bool CardDAV::Connect(){
curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
}
curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
}
+#if defined(__APPLE__)
+
SetConnectionObject(conn);
SetConnectionObject(conn);
+#endif
+
conncode = (curl_easy_perform(conn));
ptr.certdata = NULL;
conncode = (curl_easy_perform(conn));
ptr.certdata = NULL;
diff --git
a/source/carddav/carddav-contactlist.cpp
b/source/carddav/carddav-contactlist.cpp
index
6c909ae
..
ab0cf09
100644
(file)
--- a/
source/carddav/carddav-contactlist.cpp
+++ b/
source/carddav/carddav-contactlist.cpp
@@
-51,7
+51,9
@@
ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
conn = curl_easy_init();
#if defined(__APPLE__)
conn = curl_easy_init();
#if defined(__APPLE__)
+
SetConnectionObject(conn);
SetConnectionObject(conn);
+
#endif
struct CardDAVCURLPasser {
#endif
struct CardDAVCURLPasser {
@@
-362,7
+364,9
@@
ContactListData CardDAV::GetContactList(wxString SyncTokenInc){
curl_easy_setopt(sslerrconn, CURLOPT_CERTINFO, 1);
#if defined(__APPLE__)
curl_easy_setopt(sslerrconn, CURLOPT_CERTINFO, 1);
#if defined(__APPLE__)
+
SetConnectionObject(sslerrconn);
SetConnectionObject(sslerrconn);
+
#endif
sslerrconncode = (curl_easy_perform(sslerrconn));
#endif
sslerrconncode = (curl_easy_perform(sslerrconn));
diff --git
a/source/carddav/carddav-defaultadrurl.cpp
b/source/carddav/carddav-defaultadrurl.cpp
index
6ed3aa5
..
b2fec75
100644
(file)
--- a/
source/carddav/carddav-defaultadrurl.cpp
+++ b/
source/carddav/carddav-defaultadrurl.cpp
@@
-50,8
+50,12
@@
wxString CardDAV::GetDefaultAddressBookURL(){
conn = curl_easy_init();
conn = curl_easy_init();
+#if defined(__APPLE__)
+
SetConnectionObject(conn);
SetConnectionObject(conn);
+#endif
+
struct curl_slist *connhd = NULL;
struct curl_slist *connhd2 = NULL;
struct curl_slist *connhd3 = NULL;
struct curl_slist *connhd = NULL;
struct curl_slist *connhd2 = NULL;
struct curl_slist *connhd3 = NULL;
@@
-168,8
+172,12
@@
wxString CardDAV::GetDefaultAddressBookURL(){
curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
}
curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
}
+#if defined(__APPLE__)
+
SetConnectionObject(conn);
SetConnectionObject(conn);
+#endif
+
conncode = (curl_easy_perform(conn));
if (conncode == CURLE_OK){
conncode = (curl_easy_perform(conn));
if (conncode == CURLE_OK){
@@
-357,8
+365,12
@@
wxString CardDAV::GetDefaultAddressBookURL(){
curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
}
curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
}
+#if defined(__APPLE__)
+
SetConnectionObject(conn);
SetConnectionObject(conn);
+#endif
+
conncode = (curl_easy_perform(conn));
if (conncode == CURLE_OK){
conncode = (curl_easy_perform(conn));
if (conncode == CURLE_OK){
@@
-535,8
+547,12
@@
wxString CardDAV::GetDefaultAddressBookURL(){
curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
}
curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
}
+#if defined(__APPLE__)
+
SetConnectionObject(conn);
SetConnectionObject(conn);
+#endif
+
conncode = (curl_easy_perform(conn));
if (conncode == CURLE_OK){
conncode = (curl_easy_perform(conn));
if (conncode == CURLE_OK){
diff --git
a/source/carddav/carddav-processdata.cpp
b/source/carddav/carddav-processdata.cpp
index
84f5144
..
55a353f
100644
(file)
--- a/
source/carddav/carddav-processdata.cpp
+++ b/
source/carddav/carddav-processdata.cpp
@@
-48,7
+48,11
@@
void CardDAV::ProcessDataThread(){
conn = curl_easy_init();
conn = curl_easy_init();
+#if defined(__APPLE__)
+
SetConnectionObject(conn);
SetConnectionObject(conn);
+
+#endif
struct CardDAVCURLPasser {
struct CardDAVCURLPasser {
@@
-341,9
+345,13
@@
void CardDAV::ProcessDataThread(){
curl_easy_setopt(sslerrconn, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(sslerrconn, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(sslerrconn, CURLOPT_CERTINFO, 1);
curl_easy_setopt(sslerrconn, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(sslerrconn, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(sslerrconn, CURLOPT_CERTINFO, 1);
+
+#if defined(__APPLE__)
SetConnectionObject(sslerrconn);
SetConnectionObject(sslerrconn);
+#endif
+
sslerrconncode = (curl_easy_perform(sslerrconn));
#if defined(__APPLE__)
sslerrconncode = (curl_easy_perform(sslerrconn));
#if defined(__APPLE__)
diff --git
a/source/carddav/carddav-servercontact.cpp
b/source/carddav/carddav-servercontact.cpp
index
b4d55e2
..
1ebc1df
100644
(file)
--- a/
source/carddav/carddav-servercontact.cpp
+++ b/
source/carddav/carddav-servercontact.cpp
@@
-52,7
+52,11
@@
void CardDAV::GetServerContactData()
conn = curl_easy_init();
conn = curl_easy_init();
+#if defined(__APPLE__)
+
SetConnectionObject(conn);
SetConnectionObject(conn);
+
+#endif
struct CardDAVCURLPasser {
struct CardDAVCURLPasser {
@@
-286,8
+290,12
@@
void CardDAV::GetServerContactData()
curl_easy_setopt(sslerrconn, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(sslerrconn, CURLOPT_CERTINFO, 1);
curl_easy_setopt(sslerrconn, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt(sslerrconn, CURLOPT_CERTINFO, 1);
+#if defined(__APPLE__)
+
SetConnectionObject(sslerrconn);
SetConnectionObject(sslerrconn);
+#endif
+
sslerrconncode = (curl_easy_perform(sslerrconn));
SSLCertCol = BuildSSLCollection(sslerrconn);
sslerrconncode = (curl_easy_perform(sslerrconn));
SSLCertCol = BuildSSLCollection(sslerrconn);
diff --git
a/source/carddav/carddav-serveretag.cpp
b/source/carddav/carddav-serveretag.cpp
index
6ab608b
..
5ac3f27
100644
(file)
--- a/
source/carddav/carddav-serveretag.cpp
+++ b/
source/carddav/carddav-serveretag.cpp
@@
-50,8
+50,12
@@
void CardDAV::GetServerETagValueThread()
conn = curl_easy_init();
conn = curl_easy_init();
+#if defined(__APPLE__)
+
SetConnectionObject(conn);
SetConnectionObject(conn);
+#endif
+
struct CardDAVCURLPasser {
CardDAV *Data;
struct CardDAVCURLPasser {
CardDAV *Data;
@@
-321,8
+325,12
@@
void CardDAV::GetServerETagValueThread()
sslerrconncode = (curl_easy_perform(sslerrconn));
sslerrconncode = (curl_easy_perform(sslerrconn));
+#if defined(__APPLE__)
+
SetConnectionObject(sslerrconn);
SetConnectionObject(sslerrconn);
+#endif
+
SSLCertCol = BuildSSLCollection(sslerrconn);
SSLCertCol.SuccessCode = 1;
SSLCertCol = BuildSSLCollection(sslerrconn);
SSLCertCol.SuccessCode = 1;
diff --git
a/source/carddav/carddav-sslverify.cpp
b/source/carddav/carddav-sslverify.cpp
index
9969c43
..
9418e5a
100644
(file)
--- a/
source/carddav/carddav-sslverify.cpp
+++ b/
source/carddav/carddav-sslverify.cpp
@@
-74,7
+74,11
@@
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);
- SetConnectionObject(conn);
+#if defined(__APPLE__)
+
+ SetConnectionObject(conn);
+
+#endif
conncode = (curl_easy_perform(conn));
conncode = (curl_easy_perform(conn));
@@
-103,8
+107,12
@@
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__)
+
SetConnectionObject(connssldata);
SetConnectionObject(connssldata);
-
+
+#endif
+
CURLcode certfetchcode;
certfetchcode = (curl_easy_perform(connssldata));
CURLcode certfetchcode;
certfetchcode = (curl_easy_perform(connssldata));
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy