mirrors/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-10 09:43:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix #38

Browse Source
This commit is contained in:
yhirose 2018-04-20 09:33:08 -04:00
parent 755f05c02b
commit 6aa3fd6b59
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
httplib.h
View File

@ -1165,18 +1165,8 @@ inline bool can_compress(const std::string& content_type) {
content_type == "application/xhtml+xml"; content_type == "application/xhtml+xml";
} }
inline void compress(const Request& req, Response& res) inline void compress(std::string& content)
{ {
// TODO: Server version is HTTP/1.1 and 'Accpet-Encoding' has gzip, not gzip;q=0
const auto& encodings = req.get_header_value("Accept-Encoding");
if (encodings.find("gzip") == std::string::npos) {
return;
}
if (!can_compress(res.get_header_value("Content-Type"))) {
return;
}
z_stream strm; z_stream strm;
strm.zalloc = Z_NULL; strm.zalloc = Z_NULL;
strm.zfree = Z_NULL; strm.zfree = Z_NULL;
@ -1187,8 +1177,8 @@ inline void compress(const Request& req, Response& res)
return; return;
} }
strm.avail_in = res.body.size(); strm.avail_in = content.size();
strm.next_in = (Bytef *)res.body.data(); strm.next_in = (Bytef *)content.data();
std::string compressed; std::string compressed;
@ -1201,17 +1191,13 @@ inline void compress(const Request& req, Response& res)
compressed.append(buff, bufsiz - strm.avail_out); compressed.append(buff, bufsiz - strm.avail_out);
} while (strm.avail_out == 0); } while (strm.avail_out == 0);
res.set_header("Content-Encoding", "gzip"); content.swap(compressed);
res.body.swap(compressed);
deflateEnd(&strm); deflateEnd(&strm);
} }
inline void decompress_request_body(Request& req) inline void decompress(std::string& content)
{ {
if (req.get_header_value("Content-Encoding") != "gzip")
return;
z_stream strm; z_stream strm;
strm.zalloc = Z_NULL; strm.zalloc = Z_NULL;
strm.zfree = Z_NULL; strm.zfree = Z_NULL;
@ -1225,8 +1211,8 @@ inline void decompress_request_body(Request& req)
return; return;
} }
strm.avail_in = req.body.size(); strm.avail_in = content.size();
strm.next_in = (Bytef *)req.body.data(); strm.next_in = (Bytef *)content.data();
std::string decompressed; std::string decompressed;
@ -1239,7 +1225,7 @@ inline void decompress_request_body(Request& req)
decompressed.append(buff, bufsiz - strm.avail_out); decompressed.append(buff, bufsiz - strm.avail_out);
} while (strm.avail_out == 0); } while (strm.avail_out == 0);
req.body.swap(decompressed); content.swap(decompressed);
inflateEnd(&strm); inflateEnd(&strm);
} }
@ -1531,7 +1517,13 @@ inline void Server::write_response(Stream& strm, bool last_connection, const Req
if (!res.body.empty()) { if (!res.body.empty()) {
#ifdef CPPHTTPLIB_ZLIB_SUPPORT #ifdef CPPHTTPLIB_ZLIB_SUPPORT
detail::compress(req, res); // TODO: Server version is HTTP/1.1 and 'Accpet-Encoding' has gzip, not gzip;q=0
const auto& encodings = req.get_header_value("Accept-Encoding");
if (encodings.find("gzip") != std::string::npos &&
detail::can_compress(res.get_header_value("Content-Type"))) {
detail::compress(res.body);
res.set_header("Content-Encoding", "gzip");
}
#endif #endif
if (!res.has_header("Content-Type")) { if (!res.has_header("Content-Type")) {
@ -1743,15 +1735,15 @@ inline bool Server::process_request(Stream& strm, bool last_connection)
const auto& content_type = req.get_header_value("Content-Type"); const auto& content_type = req.get_header_value("Content-Type");
#ifdef CPPHTTPLIB_ZLIB_SUPPORT
detail::decompress_request_body(req);
#else
if (req.get_header_value("Content-Encoding") == "gzip") { if (req.get_header_value("Content-Encoding") == "gzip") {
#ifdef CPPHTTPLIB_ZLIB_SUPPORT
detail::decompress(req.body);
#else
res.status = 415; res.status = 415;
write_response(strm, last_connection, req, res); write_response(strm, last_connection, req, res);
return ret; return ret;
}
#endif #endif
}
if (!content_type.find("application/x-www-form-urlencoded")) { if (!content_type.find("application/x-www-form-urlencoded")) {
detail::parse_query_text(req.body, req.params); detail::parse_query_text(req.body, req.params);
@ -1936,6 +1928,14 @@ inline bool Client::process_request(Stream& strm, Request& req, Response& res)
if (!detail::read_content(strm, res, req.progress)) { if (!detail::read_content(strm, res, req.progress)) {
return false; return false;
} }
if (res.get_header_value("Content-Encoding") == "gzip") {
#ifdef CPPHTTPLIB_ZLIB_SUPPORT
detail::decompress(res.body);
#else
return false;
#endif
}
} }
return true; return true;

2
test/test.cc
View File

@ -757,6 +757,7 @@ TEST_F(ServerTest, Gzip)
EXPECT_EQ("gzip", res->get_header_value("Content-Encoding")); EXPECT_EQ("gzip", res->get_header_value("Content-Encoding"));
EXPECT_EQ("text/plain", res->get_header_value("Content-Type")); EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
EXPECT_EQ("33", res->get_header_value("Content-Length")); EXPECT_EQ("33", res->get_header_value("Content-Length"));
EXPECT_EQ("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", res->body);
EXPECT_EQ(200, res->status); EXPECT_EQ(200, res->status);
} }
@ -770,6 +771,7 @@ TEST_F(ServerTest, NoGzip)
EXPECT_EQ(false, res->has_header("Content-Encoding")); EXPECT_EQ(false, res->has_header("Content-Encoding"));
EXPECT_EQ("application/octet-stream", res->get_header_value("Content-Type")); EXPECT_EQ("application/octet-stream", res->get_header_value("Content-Type"));
EXPECT_EQ("100", res->get_header_value("Content-Length")); EXPECT_EQ("100", res->get_header_value("Content-Length"));
EXPECT_EQ("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", res->body);
EXPECT_EQ(200, res->status); EXPECT_EQ(200, res->status);
} }