Fixed a potential '//' at the end of the path of a resource + Added t…

…he 'DAV' header with the values '1,2' => class 1 + 2 supported (RFC)
OpenMarshal · Jun 9, 2017 · 27abc4e · 27abc4e
1 parent 3bc3f07
commit 27abc4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/server/MethodCallArgs.js b/lib/server/MethodCallArgs.js
@@ -23,6 +23,7 @@ var MethodCallArgs = (function () {
     }
     MethodCallArgs.create = function (server, request, response, callback) {
         var mca = new MethodCallArgs(server, request, response, null, null);
+        response.setHeader('DAV', '1,2');
         mca.askForAuthentication(false, function (e) {
             if (e) {
                 callback(e, mca);
@@ -141,7 +142,7 @@ var MethodCallArgs = (function () {
         if (uri === void 0) { uri = null; }
         if (!uri)
             uri = this.uri;
-        return this.prefixUri() + uri.replace(/\/\//g, '/');
+        return (this.prefixUri() + uri).replace(/([^:])\/\//g, '$1/');
     };
     MethodCallArgs.prototype.prefixUri = function () {
         return 'http://' + this.host.replace('/', '');

diff --git a/src/server/MethodCallArgs.ts b/src/server/MethodCallArgs.ts
@@ -43,6 +43,7 @@ export class MethodCallArgs
         callback : (error : Error, mca : MethodCallArgs) => void)
     {
         const mca = new MethodCallArgs(server, request, response, null, null);
+        response.setHeader('DAV', '1,2');
 
         mca.askForAuthentication(false, (e) => {
             if(e)
@@ -208,7 +209,7 @@ export class MethodCallArgs
         if(!uri)
             uri = this.uri;
 
-        return this.prefixUri() + uri.replace(/\/\//g, '/');
+        return (this.prefixUri() + uri).replace(/([^:])\/\//g, '$1/');
     }
 
     prefixUri()