X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav-sslverify.cpp;h=9969c43a86076757196586f2fea60ccb558ca445;hb=e1f4d1b7759935d4b0e876ee3821133abfec8d9e;hp=beac074208d479bbb6cfacf00f72c38950311ffe;hpb=f91028f262f047c01376a51eec8138647f5abd3d;p=xestiaab%2F.git

diff --git a/source/carddav/carddav-sslverify.cpp b/source/carddav/carddav-sslverify.cpp
index beac074..9969c43 100644
--- a/source/carddav/carddav-sslverify.cpp
+++ b/source/carddav/carddav-sslverify.cpp
@@ -49,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;
 
@@ -82,13 +69,13 @@ 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);
 
+                SetConnectionObject(conn);
+                
 		conncode = (curl_easy_perform(conn));
 
 		// Check if the SSL certificate is valid or self-signed or some other
@@ -116,6 +103,8 @@ CURLcode CardDAV::SSLVerifyTest(){
 			curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYPEER, 0L);
 			curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYHOST, 0L);
 
+                        SetConnectionObject(connssldata);
+            
 			CURLcode certfetchcode;
 
 			certfetchcode = (curl_easy_perform(connssldata));