X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2FCalDAV%2FCalDAV.cpp;h=964f28691710bd9f65ba74e64c05025ce420f5e1;hb=f3908f3b7bf98079d82fde9d2180c337f565d8c6;hp=c781e94b61f74bc22bb91f3dc0568bd23c23f5d3;hpb=38e306385c8dcbf636199e9ac654793cd6427a66;p=xestiacalendar%2F.git

diff --git a/source/objects/CalDAV/CalDAV.cpp b/source/objects/CalDAV/CalDAV.cpp
index c781e94..964f286 100644
--- a/source/objects/CalDAV/CalDAV.cpp
+++ b/source/objects/CalDAV/CalDAV.cpp
@@ -77,6 +77,7 @@ CalDAVStatus CalDAV::GetConnectionData(){
 	ConnectionStatus.Username = ConnectionData.Username;
 	ConnectionStatus.Prefix = ConnectionData.Prefix;
 	ConnectionStatus.UseSSL = ConnectionData.UseSSL;
+	ConnectionStatus.Timeout = ConnectionData.Timeout;
 	
 	return ConnectionStatus;
 	
@@ -121,6 +122,7 @@ CalDAVServerResult CalDAV::Connect(){
 	curl_easy_setopt(ConnectionHandle, CURLOPT_USERPWD, ServerUserPass.c_str());
 	curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
 	curl_easy_setopt(ConnectionHandle, CURLOPT_FAILONERROR, 1L);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_TIMEOUT, ConnectionData.Timeout);
 	curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEFUNCTION, CalDAVOutput);
 	curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEDATA, &ServerData);
 	curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEHEADER, &ServerHeader);