You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/12/10 17:54:07 UTC
[2/3] mesos git commit: Made `MethodNotAllowed` response compliant to
RFC 2616.
Made `MethodNotAllowed` response compliant to RFC 2616.
According to RFC 2616 the `MethodNotAllowed` response must include an
'Allow' header containing a list of valid methods.
This updates the `MethodNotAllowed` constructor invocations.
Review: https://reviews.apache.org/r/40913
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/44bd0a2c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/44bd0a2c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/44bd0a2c
Branch: refs/heads/master
Commit: 44bd0a2c41ef64826bb2d5a003bb9c3c8bf1bc4a
Parents: bf82b57
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Thu Dec 10 08:23:07 2015 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Thu Dec 10 08:50:28 2015 -0800
----------------------------------------------------------------------
src/master/http.cpp | 2 +-
src/slave/http.cpp | 2 +-
src/tests/executor_http_api_tests.cpp | 2 +-
src/tests/scheduler_http_api_tests.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/44bd0a2c/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index 5d33138..dce248d 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -382,7 +382,7 @@ Future<Response> Master::Http::scheduler(const Request& request) const
if (request.method != "POST") {
return MethodNotAllowed(
- "Expecting a 'POST' request, received '" + request.method + "'");
+ {"POST"}, "Expecting 'POST', received '" + request.method + "'");
}
v1::scheduler::Call v1Call;
http://git-wip-us.apache.org/repos/asf/mesos/blob/44bd0a2c/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index cef568d..d1b1158 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -221,7 +221,7 @@ Future<Response> Slave::Http::executor(const Request& request) const
if (request.method != "POST") {
return MethodNotAllowed(
- "Expecting a 'POST' request, received '" + request.method + "'");
+ {"POST"}, "Expecting 'POST', received '" + request.method + "'");
}
v1::executor::Call v1Call;
http://git-wip-us.apache.org/repos/asf/mesos/blob/44bd0a2c/src/tests/executor_http_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/executor_http_api_tests.cpp b/src/tests/executor_http_api_tests.cpp
index 1be657c..8d86df5 100644
--- a/src/tests/executor_http_api_tests.cpp
+++ b/src/tests/executor_http_api_tests.cpp
@@ -312,7 +312,7 @@ TEST_F(ExecutorHttpApiTest, GetRequest)
"api/v1/executor");
AWAIT_READY(response);
- AWAIT_EXPECT_RESPONSE_STATUS_EQ(MethodNotAllowed().status, response);
+ AWAIT_EXPECT_RESPONSE_STATUS_EQ(MethodNotAllowed({"POST"}).status, response);
Shutdown();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/44bd0a2c/src/tests/scheduler_http_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_http_api_tests.cpp b/src/tests/scheduler_http_api_tests.cpp
index 4f52309..4d23a5a 100644
--- a/src/tests/scheduler_http_api_tests.cpp
+++ b/src/tests/scheduler_http_api_tests.cpp
@@ -795,7 +795,7 @@ TEST_F(SchedulerHttpApiTest, GetRequest)
"api/v1/scheduler");
AWAIT_READY(response);
- AWAIT_EXPECT_RESPONSE_STATUS_EQ(MethodNotAllowed().status, response);
+ AWAIT_EXPECT_RESPONSE_STATUS_EQ(MethodNotAllowed({"POST"}).status, response);
}
} // namespace tests {