Browse Source

Fix WebUI gzip compression. Closes #1037.

adaptive-webui-19844
sledgehammer999 11 years ago
parent
commit
ade66629b1
  1. 6
      src/webui/httpresponsegenerator.cpp

6
src/webui/httpresponsegenerator.cpp

@ -35,7 +35,6 @@
void HttpResponseGenerator::setMessage(const QByteArray& message) void HttpResponseGenerator::setMessage(const QByteArray& message)
{ {
m_message = message; m_message = message;
setContentLength(message.size());
} }
void HttpResponseGenerator::setMessage(const QString& message) void HttpResponseGenerator::setMessage(const QString& message)
@ -113,7 +112,7 @@ bool HttpResponseGenerator::gCompress(QByteArray &dest_buffer) {
if (deflate_res != Z_STREAM_END) if (deflate_res != Z_STREAM_END)
return false; return false;
dest_buffer.append(tmp_buf, BUFSIZE); dest_buffer.append(tmp_buf, BUFSIZE - strm.avail_out);
deflateEnd(&strm); deflateEnd(&strm);
return true; return true;
@ -123,10 +122,11 @@ QByteArray HttpResponseGenerator::toByteArray() {
if (m_gzip) { if (m_gzip) {
QByteArray dest_buf; QByteArray dest_buf;
if (gCompress(dest_buf)) { if (gCompress(dest_buf)) {
setValue("Content-Encoding", "gzip"); setValue("content-encoding", "gzip");
m_message.swap(dest_buf); m_message.swap(dest_buf);
} }
} }
setContentLength(m_message.size());
return QHttpResponseHeader::toString().toUtf8() + m_message; return QHttpResponseHeader::toString().toUtf8() + m_message;
} }

Loading…
Cancel
Save