Minor fixes

gedaiu · May 3, 2015 · 870dbe3 · 870dbe3
1 parent 8c63948
commit 870dbe3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/source/vibedav/base.d b/source/vibedav/base.d
@@ -93,7 +93,10 @@ unittest {
 	assert(path.toString == "/base/file.txt");
 }
 
-
+string urlToString(URL url) {
+	string name = url.path.toNativeString;
+	return name.replace(" ", "%20");
+}
 
 struct DavReport {
 	string name;
@@ -326,7 +329,7 @@ class Dav : IDav {
 			list["getcontentlength:DAV:"] = true;
 			list["getcontenttype:DAV:"] = true;
 			list["getetag:DAV:"] = true;
-			list["lastmodified:DAV:"] = true;
+			list["getlastmodified:DAV:"] = true;
 			list["resourcetype:DAV:"] = true;
 
 			return list;

diff --git a/source/vibedav/davresource.d b/source/vibedav/davresource.d
@@ -631,7 +631,7 @@ class DavResource : IDavResourcePluginHub {
 
 		DavProp[][int] result;
 
-		item[`d:href`] = url.path.toNativeString;
+		item[`d:href`] = urlToString(url);
 
 		foreach_reverse(key; props.keys) {
 			DavProp p;
@@ -682,7 +682,7 @@ class DavResource : IDavResourcePluginHub {
 	string propPatch(DavProp document) {
 		string description;
 		string result = `<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV:"><d:response>`;
-		result ~= `<d:href>` ~ url.toString ~ `</d:href>`;
+		result ~= `<d:href>` ~ urlToString(url) ~ `</d:href>`;
 
 		auto updateList = [document].getTagChilds("propertyupdate");
 
@@ -717,8 +717,6 @@ class DavResource : IDavResourcePluginHub {
 
 		result ~= `</d:response></d:multistatus>`;
 
-		string strUrl = url.toString;
-
 		return result;
 	}