Moved the 'Allow' response header from the 'OPTIONS' method to all th…

…e methods + Added the 'Server' header to the responses
OpenMarshal · Jun 15, 2017 · e015847 · e015847
1 parent fd4158b
commit e015847
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/lib/server/MethodCallArgs.js b/lib/server/MethodCallArgs.js
@@ -25,6 +25,11 @@ var MethodCallArgs = (function () {
     MethodCallArgs.create = function (server, request, response, callback) {
         var mca = new MethodCallArgs(server, request, response, null, null);
         response.setHeader('DAV', '1,2');
+        response.setHeader('Server', server.options.serverName + '/' + server.options.version);
+        response.setHeader('Allow', Object
+            .keys(server.methods)
+            .map(function (s) { return s.toUpperCase(); })
+            .join(','));
         mca.askForAuthentication(false, function (e) {
             if (e) {
                 callback(e, mca);

diff --git a/lib/server/commands/Options.js b/lib/server/commands/Options.js
@@ -3,12 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var WebDAVRequest_1 = require("../WebDAVRequest");
 function default_1(arg, callback) {
     arg.noBodyExpected(function () {
-        var methods = Object
-            .keys(arg.server.methods)
-            .map(function (s) { return s.toUpperCase(); })
-            .join(',');
         arg.setCode(WebDAVRequest_1.HTTPCodes.OK);
-        arg.response.setHeader('Allow', methods);
         callback();
     });
 }

diff --git a/src/server/MethodCallArgs.ts b/src/server/MethodCallArgs.ts
@@ -47,6 +47,11 @@ export class MethodCallArgs
     {
         const mca = new MethodCallArgs(server, request, response, null, null);
         response.setHeader('DAV', '1,2');
+        response.setHeader('Server', server.options.serverName + '/' + server.options.version);
+        response.setHeader('Allow', Object
+            .keys(server.methods)
+            .map(s => s.toUpperCase())
+            .join(','));
 
         mca.askForAuthentication(false, (e) => {
             if(e)

diff --git a/src/server/commands/Options.ts b/src/server/commands/Options.ts
@@ -3,13 +3,7 @@ import { HTTPCodes, MethodCallArgs } from '../WebDAVRequest'
 export default function(arg : MethodCallArgs, callback)
 {
     arg.noBodyExpected(() => {
-        const methods = Object
-            .keys(arg.server.methods)
-            .map(s => s.toUpperCase())
-            .join(',');
-
         arg.setCode(HTTPCodes.OK);
-        arg.response.setHeader('Allow', methods);
         callback();
     })
 }