Added #defined(__APPLE__) around SetConnectionObject in the CardDAV object.

[xestiaab/.git] / source / carddav / carddav-sslverify.cpp

diff --git a/source/carddav/carddav-sslverify.cpp b/source/carddav/carddav-sslverify.cpp
index dd0a749..9418e5a 100644 (file)
--- a/source/carddav/carddav-sslverify.cpp
+++ b/source/carddav/carddav-sslverify.cpp
@@ -30,6 +30,8 @@
 
 CURLcode CardDAV::SSLVerifyTest(){
 
+       // Verify the SSL information.
+       
        PageData.Clear();
        PageHeader.Clear();
 
@@ -47,19 +49,6 @@ CURLcode CardDAV::SSLVerifyTest(){
 
        conn = curl_easy_init();
 
-       /*struct CardDAVCURLPasser {
-
-               CardDAV *Data;
-               bool HeaderMode = TRUE;
-
-       } CardDAVHeader, CardDAVFooter;
-
-       CardDAVHeader.Data = this;
-       CardDAVHeader.HeaderMode = TRUE;
-
-       CardDAVFooter.Data = this;
-       CardDAVFooter.HeaderMode = FALSE;*/
-
        wxString Data1;
        wxString Data2;
 
@@ -80,13 +69,17 @@ CURLcode CardDAV::SSLVerifyTest(){
                curl_easy_setopt(conn, CURLOPT_URL, (const char*)ServerAddressSSL.mb_str(wxConvUTF8));
                curl_easy_setopt(conn, CURLOPT_CERTINFO, 1);
                curl_easy_setopt(conn, CURLOPT_VERBOSE, 1L);
-               //curl_easy_setopt(conn, CURLOPT_SSL_VERIFYPEER, FALSE);
-               //curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, FALSE);
                curl_easy_setopt(conn, CURLOPT_ERRORBUFFER, curlerrbuffer);
                curl_easy_setopt(conn, CURLOPT_WRITEFUNCTION, WritebackFunc);
                curl_easy_setopt(conn, CURLOPT_WRITEDATA, &PageData);
                curl_easy_setopt(conn, CURLOPT_WRITEHEADER, &PageHeader);
 
+#if defined(__APPLE__)
+               
+               SetConnectionObject(conn);
+               
+#endif
+                
                conncode = (curl_easy_perform(conn));
 
                // Check if the SSL certificate is valid or self-signed or some other
@@ -114,6 +107,12 @@ CURLcode CardDAV::SSLVerifyTest(){
                        curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYPEER, 0L);
                        curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYHOST, 0L);
 
+#if defined(__APPLE__)
+                       
+                        SetConnectionObject(connssldata);
+                       
+#endif
+                       
                        CURLcode certfetchcode;
 
                        certfetchcode = (curl_easy_perform(connssldata));