From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sat, 23 Apr 2016 23:22:26 +0000 (+0100)
Subject: /principals should be /principals/
X-Git-Tag: release-0.02~290
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=5a2a8e2cc41d9b7829a82e5a4db822a13b7fb837;p=xestiacalendar%2F.git

/principals should be /principals/

/principals should be /principals/ in various parts of the CalDAV object
when restoring the settings back to their original state.

Subroutines affected in the CalDAV object:

GetCalendarHome(string);
AddCalendar(string);
---

diff --git a/source/objects/CalDAV/CalDAV.cpp b/source/objects/CalDAV/CalDAV.cpp
index e2a787d..22590ce 100644
--- a/source/objects/CalDAV/CalDAV.cpp
+++ b/source/objects/CalDAV/CalDAV.cpp
@@ -437,12 +437,13 @@ string CalDAV::GetCalendarHome(string UserPrincipalURI){
 	
 	// Reset the changed settings.
 	
-	string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals");
+	string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals/");
 	curl_easy_setopt(ConnectionHandle, CURLOPT_URL, OriginalServerAddress.c_str());
 	
 	curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 0L);
 	curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, NULL);
 	curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, NULL);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, NULL);
 	
 	return CalendarHomeURI;
 	
@@ -614,7 +615,7 @@ CalDAVServerResult CalDAV::AddCalendar(string CalendarName){
 	
 	// Restore the original settings.
 	
-	string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals");
+	string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals/");
 	curl_easy_setopt(ConnectionHandle, CURLOPT_URL, OriginalServerAddress.c_str());
 	curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, NULL);	
 	curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 0L);