Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix gzip bug

This commit is contained in:
an-tao 2018-09-03 14:04:26 +08:00
parent 6315dd85ee
commit 1c5651e2f8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/HttpServer.cc
View File

@ -171,7 +171,7 @@ void HttpServer::onRequest(const TcpConnectionPtr& conn, const HttpRequestPtr& r
//use gzip //use gzip
LOG_TRACE<<"Use gzip to compress the body"; LOG_TRACE<<"Use gzip to compress the body";
char *zbuf=new char[response->getBody().length()]; char *zbuf=new char[response->getBody().length()];
size_t zlen; size_t zlen=response->getBody().length();
if(gzcompress(response->getBody().data(), if(gzcompress(response->getBody().data(),
response->getBody().length(), response->getBody().length(),
zbuf,&zlen)>=0) zbuf,&zlen)>=0)

7
lib/src/Utilities.cc
View File

@ -1,5 +1,6 @@
#include <drogon/utils/Utilities.h> #include <drogon/utils/Utilities.h>
#include <drogon/config.h> #include <drogon/config.h>
#include <trantor/utils/Logger.h>
#include <string.h> #include <string.h>
#include <zlib.h> #include <zlib.h>
namespace drogon{ namespace drogon{
@ -245,7 +246,11 @@ int gzcompress(const char *data, const size_t ndata,
c_stream.next_out = (Bytef *)zdata; c_stream.next_out = (Bytef *)zdata;
c_stream.avail_out = *nzdata; c_stream.avail_out = *nzdata;
while(c_stream.avail_in != 0 && c_stream.total_out < *nzdata) { while(c_stream.avail_in != 0 && c_stream.total_out < *nzdata) {
if(deflate(&c_stream, Z_NO_FLUSH) != Z_OK) return-1; if(deflate(&c_stream, Z_NO_FLUSH) != Z_OK)
{
LOG_ERROR<<"compress err:"<<c_stream.msg;
return -1;
}
} }
if(c_stream.avail_in != 0) return c_stream.avail_in; if(c_stream.avail_in != 0) return c_stream.avail_in;
for(;;) { for(;;) {