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
Added LANG to the SaveString function of ContactDataObject
[xestiaab/.git]
/
source
/
carddav
/
carddav-serveretag.cpp
diff --git
a/source/carddav/carddav-serveretag.cpp
b/source/carddav/carddav-serveretag.cpp
index
cf32338
..
8784218
100644
(file)
--- a/
source/carddav/carddav-serveretag.cpp
+++ b/
source/carddav/carddav-serveretag.cpp
@@
-41,8
+41,8
@@
void CardDAV::GetServerETagValueThread()
AbortConnection = FALSE;
bool FilenameIsDirectory = FALSE;
AbortConnection = FALSE;
bool FilenameIsDirectory = FALSE;
-
CURL *conn;
-
CURLcode conncode;
+ CURL *conn;
+ CURLcode conncode;
wxString ServerAddressURL;
wxString ServerAuth;
wxString ServerAddressSSL;
wxString ServerAddressURL;
wxString ServerAuth;
wxString ServerAddressSSL;
@@
-50,6
+50,12
@@
void CardDAV::GetServerETagValueThread()
conn = curl_easy_init();
conn = curl_easy_init();
+#if defined(__APPLE__)
+
+ SetConnectionObject(conn);
+
+#endif
+
struct CardDAVCURLPasser {
CardDAV *Data;
struct CardDAVCURLPasser {
CardDAV *Data;
@@
-66,7
+72,7
@@
void CardDAV::GetServerETagValueThread()
wxString Data1;
wxString Data2;
wxString Data1;
wxString Data2;
- ServerAddressURL = ServerAddress + wxT(":") + wxString::Format(wxT("%i"), ServerPort) +
wxT("/") +
ServerPrefix + ServerFilenameLocation;
+ ServerAddressURL = ServerAddress + wxT(":") + wxString::Format(wxT("%i"), ServerPort) + ServerPrefix + ServerFilenameLocation;
ServerAddressSSL = wxT("https://") + ServerAddressURL;
ServerAddressNormal = wxT("http://") + ServerAddressURL;
ServerAddressSSL = wxT("https://") + ServerAddressURL;
ServerAddressNormal = wxT("http://") + ServerAddressURL;
@@
-109,6
+115,10
@@
void CardDAV::GetServerETagValueThread()
curl_easy_setopt(conn, CURLOPT_POSTFIELDS, query);
curl_easy_setopt(conn, CURLOPT_POSTFIELDSIZE, strlen(query));
curl_easy_setopt(conn, CURLOPT_POSTFIELDS, query);
curl_easy_setopt(conn, CURLOPT_POSTFIELDSIZE, strlen(query));
+#if defined(__APPLE__) || defined(__WIN32__)
+
+#else
+
ServerCertFilename = GetAccountDir(ServerAccount, TRUE);
if (wxFile::Exists(ServerCertFilename) == TRUE){
ServerCertFilename = GetAccountDir(ServerAccount, TRUE);
if (wxFile::Exists(ServerCertFilename) == TRUE){
@@
-119,6
+129,8
@@
void CardDAV::GetServerETagValueThread()
}
}
+#endif
+
claconncode = (curl_easy_perform(conn));
// If CURLE_PEER_FAILED_VERIFICATION is returned, retry without
claconncode = (curl_easy_perform(conn));
// If CURLE_PEER_FAILED_VERIFICATION is returned, retry without
@@
-164,6
+176,10
@@
void CardDAV::GetServerETagValueThread()
// Check if it fails with a CURLE_SSL_CACERT then compare
// the certificates as PEM files.
// Check if it fails with a CURLE_SSL_CACERT then compare
// the certificates as PEM files.
+#if defined(__APPLE__)
+
+#else
+
if (claconncode == CURLE_SSL_CACERT && wxFile::Exists(ServerCertFilename) == TRUE){
CURL *sslerrconn;
if (claconncode == CURLE_SSL_CACERT && wxFile::Exists(ServerCertFilename) == TRUE){
CURL *sslerrconn;
@@
-270,6
+286,8
@@
void CardDAV::GetServerETagValueThread()
curl_easy_cleanup(sslerrconn);
}
curl_easy_cleanup(sslerrconn);
}
+
+#endif
// Sort out SSL error.
// Sort out SSL error.
@@
-307,6
+325,12
@@
void CardDAV::GetServerETagValueThread()
sslerrconncode = (curl_easy_perform(sslerrconn));
sslerrconncode = (curl_easy_perform(sslerrconn));
+#if defined(__APPLE__)
+
+ SetConnectionObject(sslerrconn);
+
+#endif
+
SSLCertCol = BuildSSLCollection(sslerrconn);
SSLCertCol.SuccessCode = 1;
SSLCertCol = BuildSSLCollection(sslerrconn);
SSLCertCol.SuccessCode = 1;
@@
-317,7
+341,7
@@
void CardDAV::GetServerETagValueThread()
} else if (claconncode == CURLE_HTTP_RETURNED_ERROR){
} else if (claconncode == CURLE_HTTP_RETURNED_ERROR){
- fprintf(stderr, "curl_easy_perform() failed: %s\n",
+ fprintf(stderr, "
GetServerETagValueThread():
curl_easy_perform() failed: %s\n",
curl_easy_strerror(claconncode));
int http_code = 0;
curl_easy_getinfo(conn, CURLINFO_RESPONSE_CODE, &http_code);
curl_easy_strerror(claconncode));
int http_code = 0;
curl_easy_getinfo(conn, CURLINFO_RESPONSE_CODE, &http_code);
@@
-329,7
+353,7
@@
void CardDAV::GetServerETagValueThread()
} else {
} else {
- fprintf(stderr, "curl_easy_perform() failed: %s\n",
+ fprintf(stderr, "
GetServerETagValueThread():
curl_easy_perform() failed: %s\n",
curl_easy_strerror(claconncode));
int http_code = 0;
curl_easy_getinfo(conn, CURLINFO_RESPONSE_CODE, &http_code);
curl_easy_strerror(claconncode));
int http_code = 0;
curl_easy_getinfo(conn, CURLINFO_RESPONSE_CODE, &http_code);
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy