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

Support for deflate compression (#360)

Browse Source
This commit is contained in:
rymis 2020-02-24 17:48:00 +01:00 committed by GitHub
parent 9a663aa94e
commit f2bb9c45d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
httplib.h
View File

@ -1667,14 +1667,15 @@ inline bool compress(std::string &content) {
class decompressor { class decompressor {
public: public:
decompressor() { decompressor() {
std::memset(&strm, 0, sizeof(strm));
strm.zalloc = Z_NULL; strm.zalloc = Z_NULL;
strm.zfree = Z_NULL; strm.zfree = Z_NULL;
strm.opaque = Z_NULL; strm.opaque = Z_NULL;
// 15 is the value of wbits, which should be at the maximum possible value // 15 is the value of wbits, which should be at the maximum possible value
// to ensure that any gzip stream can be decoded. The offset of 16 specifies // to ensure that any gzip stream can be decoded. The offset of 32 specifies
// that the stream to decompress will be formatted with a gzip wrapper. // that the stream type should be automatically detected either gzip or deflate.
is_valid_ = inflateInit2(&strm, 16 + 15) == Z_OK; is_valid_ = inflateInit2(&strm, 32 + 15) == Z_OK;
} }
~decompressor() { inflateEnd(&strm); } ~decompressor() { inflateEnd(&strm); }
@ -1872,12 +1873,14 @@ bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status,
#ifdef CPPHTTPLIB_ZLIB_SUPPORT #ifdef CPPHTTPLIB_ZLIB_SUPPORT
decompressor decompressor; decompressor decompressor;
if (!decompressor.is_valid()) { std::string content_encoding = x.get_header_value("Content-Encoding");
status = 500; if (content_encoding.find("gzip") != std::string::npos
return false; || content_encoding.find("deflate") != std::string::npos) {
} if (!decompressor.is_valid()) {
status = 500;
return false;
}
if (x.get_header_value("Content-Encoding") == "gzip") {
out = [&](const char *buf, size_t n) { out = [&](const char *buf, size_t n) {
return decompressor.decompress( return decompressor.decompress(
buf, n, [&](const char *buf, size_t n) { return receiver(buf, n); }); buf, n, [&](const char *buf, size_t n) { return receiver(buf, n); });

13
test/test.cc
View File

@ -1705,6 +1705,19 @@ TEST_F(ServerTest, PutLargeFileWithGzip) {
EXPECT_EQ(200, res->status); EXPECT_EQ(200, res->status);
EXPECT_EQ(LARGE_DATA, res->body); EXPECT_EQ(LARGE_DATA, res->body);
} }
TEST_F(ServerTest, PutContentWithDeflate) {
cli_.set_compress(false);
httplib::Headers headers;
headers.emplace("Content-Encoding", "deflate");
// PUT in deflate format:
auto res = cli_.Put("/put", headers, "\170\234\013\010\015\001\0\001\361\0\372", "text/plain");
ASSERT_TRUE(res != nullptr);
EXPECT_EQ(200, res->status);
EXPECT_EQ("PUT", res->body);
}
#endif #endif
TEST_F(ServerTest, Patch) { TEST_F(ServerTest, Patch) {