Check for __WIN32__ in addition to __APPLE__

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

diff --git a/source/carddav/carddav-sslverify.cpp b/source/carddav/carddav-sslverify.cpp
index 9418e5a..5d81bb3 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;
-       CURLcode conncode;
+       CURLcode conncode = CURLE_OK;
        wxString ServerAddressURL;
        wxString ServerAuth;
        wxString ServerAddressSSL;
@@ -74,10 +74,10 @@ CURLcode CardDAV::SSLVerifyTest(){
                curl_easy_setopt(conn, CURLOPT_WRITEDATA, &PageData);
                curl_easy_setopt(conn, CURLOPT_WRITEHEADER, &PageHeader);
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__WIN32__)
                
                SetConnectionObject(conn);
-               
+
 #endif
                 
                conncode = (curl_easy_perform(conn));
@@ -90,6 +90,9 @@ CURLcode CardDAV::SSLVerifyTest(){
                        // Connection is OK. Do nothing.
 
                        *ServerResult = TRUE;
+                       
+#if !defined(__APPLE__) && !defined(__WIN32__)
+                       
 
                } else if (conncode == CURLE_SSL_CACERT || conncode == CURLE_SSL_CONNECT_ERROR){
 
@@ -107,16 +110,18 @@ CURLcode CardDAV::SSLVerifyTest(){
                        curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYPEER, 0L);
                        curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYHOST, 0L);
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__WIN32__)
                        
                         SetConnectionObject(connssldata);
-                       
+
 #endif
                        
                        CURLcode certfetchcode;
 
                        certfetchcode = (curl_easy_perform(connssldata));
 
+#if !defined(__APPLE__) && !defined(__WIN32__) 
+
                        VerifyCertCollection = BuildSSLCollection(connssldata);
 
                        if (certfetchcode == CURLE_OK){
@@ -131,6 +136,8 @@ CURLcode CardDAV::SSLVerifyTest(){
 
                        }
 
+#endif
+
                        *ServerResult = FALSE;
 
                } else {