Fixed cleaning of old object files

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

diff --git a/source/carddav/carddav-connect.cpp b/source/carddav/carddav-connect.cpp
index 98256e5..a265497 100644 (file)
--- a/source/carddav/carddav-connect.cpp
+++ b/source/carddav/carddav-connect.cpp
@@ -30,6 +30,8 @@
 
 bool CardDAV::Connect(){
 
+       // Connect to the CardDAV server.
+       
        PageData.Clear();
        PageHeader.Clear();
 
@@ -70,22 +72,6 @@ bool CardDAV::Connect(){
        
        // Try SSL first.
 
-
-       /*
-       char *ServerAdrSSLChar = new char[(ServerAddressSSL.Length() - 1)];
-       //memset(ServerAdrSSLChar, 0, ServerAddressSSL.Length());
-       strncpy(ServerAdrSSLChar, (const char*)ServerAddressSSL.mb_str(wxConvUTF8), (ServerAddressSSL.Length() - 1));
-       
-       char *ServerAdrNorChar = new char[(ServerAddressNormal.Length() - 1)];
-       //memset(ServerAdrNorChar, 0, ServerAddressSSL.Length());       
-       strncpy(ServerAdrNorChar, (const char*)ServerAddressNormal.mb_str(wxConvUTF8), (ServerAddressNormal.Length() - 1));
-
-       char *ServerAuthChar = new char[(ServerAuth.Length() - 1)];
-       //memset(ServerAuthChar, 0, ServerAddressSSL.Length()); 
-       strncpy(ServerAuthChar, (const char*)ServerAuth.mb_str(wxConvUTF8), (ServerAuth.Length() - 1));
-       
-       */
-       
        if (ServerSSL){
 
                union {
@@ -98,6 +84,15 @@ bool CardDAV::Connect(){
                // Setup two initial connections and attempt to get the certificate data.
 
                curl_easy_setopt(conn, CURLOPT_URL, (const char*)ServerAddressSSL.mb_str(wxConvUTF8));
+               curl_easy_setopt(conn, CURLOPT_NOPROGRESS, 1L);
+               curl_easy_setopt(conn, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+               curl_easy_setopt(conn, CURLOPT_TIMEOUT, 60);
+               curl_easy_setopt(conn, CURLOPT_FAILONERROR, TRUE);
+               curl_easy_setopt(conn, CURLOPT_USERAGENT, XSDAB_USERAGENT);
+               curl_easy_setopt(conn, CURLOPT_WRITEFUNCTION, WritebackFunc);
+               curl_easy_setopt(conn, CURLOPT_WRITEDATA, &PageData);
+               curl_easy_setopt(conn, CURLOPT_WRITEHEADER, &PageHeader);
+               curl_easy_setopt(conn, CURLOPT_NOSIGNAL, 1);
                curl_easy_setopt(conn, CURLOPT_CERTINFO, 1);
 
                conncode = (curl_easy_perform(conn));
@@ -127,6 +122,8 @@ bool CardDAV::Connect(){
 
                }
 
+               ServerAddressSSL.append("principals/");
+
                curl_easy_setopt(conn, CURLOPT_URL, (const char*)ServerAddressSSL.mb_str(wxConvUTF8));
                curl_easy_setopt(conn, CURLOPT_NOPROGRESS, 1L);
                curl_easy_setopt(conn, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
@@ -137,6 +134,7 @@ bool CardDAV::Connect(){
                curl_easy_setopt(conn, CURLOPT_WRITEFUNCTION, WritebackFunc);
                curl_easy_setopt(conn, CURLOPT_WRITEDATA, &PageData);
                curl_easy_setopt(conn, CURLOPT_WRITEHEADER, &PageHeader);
+               curl_easy_setopt(conn, CURLOPT_CUSTOMREQUEST, "OPTIONS");
                curl_easy_setopt(conn, CURLOPT_NOSIGNAL, 1);
                curl_easy_setopt(conn, CURLOPT_CERTINFO, 1);
                
@@ -145,6 +143,12 @@ bool CardDAV::Connect(){
                        curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, 0L);
                }
 
+#if defined(__APPLE__) || defined(__WIN32__)
+                
+                SetConnectionObject(conn);
+        
+#endif
+                
                conncode = (curl_easy_perform(conn));
                
                ptr.certdata = NULL;