Now write 'DAV:href' at the head of the parent's children, fixing iss…

…ues with 'cadaver', 'davfs2', etc...
OpenMarshal · Jun 13, 2017 · 9d9d512 · 9d9d512
1 parent 310b860
commit 9d9d512
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/lib/server/commands/Lock.js b/lib/server/commands/Lock.js
@@ -17,7 +17,7 @@ function createResponse(arg, lock) {
     var activelock = prop.ele('D:lockdiscovery').ele('D:activelock');
     activelock.ele('D:locktype').ele(lock.lockKind.type.value);
     activelock.ele('D:lockscope').ele(lock.lockKind.scope.value);
-    activelock.ele('D:locktoken').ele('D:href').add(lock.uuid);
+    activelock.ele('D:locktoken').ele('D:href', undefined, true).add(lock.uuid);
     activelock.ele('D:lockroot').add(arg.fullUri());
     activelock.ele('D:depth').add('infinity');
     activelock.ele('D:owner').add(lock.owner);

diff --git a/lib/server/commands/Propfind.js b/lib/server/commands/Propfind.js
@@ -232,8 +232,8 @@ function default_1(arg, callback) {
                                         if (lock.owner)
                                             activelock.ele('D:owner').add(lock.owner);
                                         activelock.ele('D:timeout').add('Second-' + (lock.expirationDate - Date.now()));
-                                        activelock.ele('D:locktoken').ele('D:href').add(lock.uuid);
-                                        activelock.ele('D:lockroot').ele('D:href').add(arg.fullUri(path_1).replace(' ', '%20'));
+                                        activelock.ele('D:locktoken').ele('D:href', undefined, true).add(lock.uuid);
+                                        activelock.ele('D:lockroot').ele('D:href', undefined, true).add(arg.fullUri(path_1).replace(' ', '%20'));
                                     }
                                 }
                                 nbOut(null);
@@ -245,8 +245,8 @@ function default_1(arg, callback) {
                                 return;
                             }
                             var p = arg.fullUri(path).replace(' ', '%20');
-                            response.ele('D:href').add(p.lastIndexOf('/') !== p.length - 1 && type.isDirectory ? p + '/' : p);
-                            response.ele('D:location').ele('D:href').add(p);
+                            response.ele('D:href', undefined, true).add(p.lastIndexOf('/') !== p.length - 1 && type.isDirectory ? p + '/' : p);
+                            response.ele('D:location').ele('D:href', undefined, true).add(p);
                             if (tags.resourcetype.value && type.isDirectory)
                                 tags.resourcetype.el.ele('D:collection');
                             if (type.isFile) {

diff --git a/lib/server/commands/Proppatch.js b/lib/server/commands/Proppatch.js
@@ -16,7 +16,7 @@ function default_1(arg, callback) {
                     'xmlns:D': 'DAV:'
                 });
                 var response = multistatus.ele('D:response');
-                response.ele('D:href').add(arg.fullUri());
+                response.ele('D:href', undefined, true).add(arg.fullUri());
                 try {
                     var xml = XML_1.XML.parse(arg.data);
                     var root_1 = xml.find('DAV:propertyupdate');

diff --git a/src/server/commands/Lock.ts b/src/server/commands/Lock.ts
@@ -18,7 +18,7 @@ function createResponse(arg : MethodCallArgs, lock : Lock)
 
     activelock.ele('D:locktype').ele(lock.lockKind.type.value);
     activelock.ele('D:lockscope').ele(lock.lockKind.scope.value);
-    activelock.ele('D:locktoken').ele('D:href').add(lock.uuid);
+    activelock.ele('D:locktoken').ele('D:href', undefined, true).add(lock.uuid);
     activelock.ele('D:lockroot').add(arg.fullUri());
     activelock.ele('D:depth').add('infinity');
     activelock.ele('D:owner').add(lock.owner);

diff --git a/src/server/commands/Propfind.ts b/src/server/commands/Propfind.ts
@@ -310,8 +310,8 @@ export default function(arg : MethodCallArgs, callback)
                                         if(lock.owner)
                                             activelock.ele('D:owner').add(lock.owner)
                                         activelock.ele('D:timeout').add('Second-' + (lock.expirationDate - Date.now()))
-                                        activelock.ele('D:locktoken').ele('D:href').add(lock.uuid)
-                                        activelock.ele('D:lockroot').ele('D:href').add(arg.fullUri(path).replace(' ', '%20'))
+                                        activelock.ele('D:locktoken').ele('D:href', undefined, true).add(lock.uuid)
+                                        activelock.ele('D:lockroot').ele('D:href', undefined, true).add(arg.fullUri(path).replace(' ', '%20'))
                                     }
                                 }
 
@@ -327,8 +327,8 @@ export default function(arg : MethodCallArgs, callback)
                             }
 
                             const p = arg.fullUri(path).replace(' ', '%20');
-                            response.ele('D:href').add(p.lastIndexOf('/') !== p.length - 1 && type.isDirectory ? p + '/' : p);
-                            response.ele('D:location').ele('D:href').add(p);
+                            response.ele('D:href', undefined, true).add(p.lastIndexOf('/') !== p.length - 1 && type.isDirectory ? p + '/' : p);
+                            response.ele('D:location').ele('D:href', undefined, true).add(p);
 
                             if(tags.resourcetype.value && type.isDirectory)
                                 tags.resourcetype.el.ele('D:collection')

diff --git a/src/server/commands/Proppatch.ts b/src/server/commands/Proppatch.ts
@@ -20,7 +20,7 @@ export default function(arg : MethodCallArgs, callback)
                     'xmlns:D': 'DAV:'
                 });
                 const response = multistatus.ele('D:response');
-                response.ele('D:href').add(arg.fullUri());
+                response.ele('D:href', undefined, true).add(arg.fullUri());
 
                 try
                 {