Repository: mesos Updated Branches: refs/heads/master a221abc2a -> 16763a5b6
Renamed Request.accepts to Request.acceptsEncoding. This abstracts 'Accepts-Encoding', we should change the name to better reflect this. Review: https://reviews.apache.org/r/36328 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/16763a5b Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/16763a5b Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/16763a5b Branch: refs/heads/master Commit: 16763a5b6f029f5a017cac5f57d1c5fc4d7922a6 Parents: a221abc Author: Isabel Jimenez <[email protected]> Authored: Thu Jul 9 12:43:55 2015 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Thu Jul 9 12:43:56 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/include/process/http.hpp | 2 +- 3rdparty/libprocess/src/encoder.hpp | 2 +- 3rdparty/libprocess/src/http.cpp | 2 +- 3rdparty/libprocess/src/tests/encoder_tests.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/16763a5b/3rdparty/libprocess/include/process/http.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/http.hpp b/3rdparty/libprocess/include/process/http.hpp index 32a2d84..0db303a 100644 --- a/3rdparty/libprocess/include/process/http.hpp +++ b/3rdparty/libprocess/include/process/http.hpp @@ -106,7 +106,7 @@ struct Request // Returns whether the encoding is considered acceptable in the request. // TODO(bmahler): Consider this logic being in decoder.hpp, and having the // Request contain a member variable for each popular HTTP 1.0/1.1 header. - bool accepts(const std::string& encoding) const; + bool acceptsEncoding(const std::string& encoding) const; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/16763a5b/3rdparty/libprocess/src/encoder.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/encoder.hpp b/3rdparty/libprocess/src/encoder.hpp index b898658..f53fc0d 100644 --- a/3rdparty/libprocess/src/encoder.hpp +++ b/3rdparty/libprocess/src/encoder.hpp @@ -189,7 +189,7 @@ public: if (response.type == http::Response::BODY && response.body.length() >= GZIP_MINIMUM_BODY_LENGTH && !headers.contains("Content-Encoding") && - request.accepts("gzip")) { + request.acceptsEncoding("gzip")) { Try<std::string> compressed = gzip::compress(body); if (compressed.isError()) { LOG(WARNING) << "Failed to gzip response body: " << compressed.error(); http://git-wip-us.apache.org/repos/asf/mesos/blob/16763a5b/3rdparty/libprocess/src/http.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/http.cpp b/3rdparty/libprocess/src/http.cpp index 0898335..095572c 100644 --- a/3rdparty/libprocess/src/http.cpp +++ b/3rdparty/libprocess/src/http.cpp @@ -101,7 +101,7 @@ void initialize() } -bool Request::accepts(const string& encoding) const +bool Request::acceptsEncoding(const string& encoding) const { // See RFC 2616, section 14.3 for the details. Option<string> accepted = headers.get("Accept-Encoding"); http://git-wip-us.apache.org/repos/asf/mesos/blob/16763a5b/3rdparty/libprocess/src/tests/encoder_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/encoder_tests.cpp b/3rdparty/libprocess/src/tests/encoder_tests.cpp index 9fccab1..5ee8188 100644 --- a/3rdparty/libprocess/src/tests/encoder_tests.cpp +++ b/3rdparty/libprocess/src/tests/encoder_tests.cpp @@ -60,7 +60,7 @@ TEST(EncoderTest, AcceptableEncodings) requests[6].headers["Accept-Encoding"] = "compress,\tgzip;q=0.0"; foreach (const Request& request, requests) { - EXPECT_FALSE(request.accepts("gzip")) + EXPECT_FALSE(request.acceptsEncoding("gzip")) << "Gzip encoding is unacceptable for 'Accept-Encoding: " << request.headers.get("Accept-Encoding").get() << "'"; } @@ -85,7 +85,7 @@ TEST(EncoderTest, AcceptableEncodings) gzipRequests[11].headers["Accept-Encoding"] = "gzip"; foreach (const Request& gzipRequest, gzipRequests) { - EXPECT_TRUE(gzipRequest.accepts("gzip")) + EXPECT_TRUE(gzipRequest.acceptsEncoding("gzip")) << "Gzip encoding is acceptable for 'Accept-Encoding: " << gzipRequest.headers.get("Accept-Encoding").get() << "'"; }
