Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Brotli compress_helper early termination issue #963

Merged
merged 2 commits into from
Nov 12, 2018
Merged

Fix Brotli compress_helper early termination issue #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3402d1a
Fix Brotli compress_helper early termination issue
epistor Nov 8, 2018
d578b31
Merge remote-tracking branch 'origin/master' into compress
BillyONeal Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Release/include/cpprest/asyncrt_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,16 @@ namespace details
return std::unique_ptr<_Type>(new _Type(std::forward<_Arg1>(arg1), std::forward<_Arg2>(arg2), std::forward<_Arg3>(arg3), std::forward<_Arg4>(arg4)));
}

template <typename _Type, typename _Arg1, typename _Arg2, typename _Arg3, typename _Arg4, typename _Arg5>
std::unique_ptr<_Type> make_unique(_Arg1&& arg1, _Arg2&& arg2, _Arg3&& arg3, _Arg4&& arg4, _Arg5&& arg5) {
return std::unique_ptr<_Type>(new _Type(std::forward<_Arg1>(arg1), std::forward<_Arg2>(arg2), std::forward<_Arg3>(arg3), std::forward<_Arg4>(arg4), std::forward<_Arg5>(arg5)));
}

template <typename _Type, typename _Arg1, typename _Arg2, typename _Arg3, typename _Arg4, typename _Arg5, typename _Arg6>
std::unique_ptr<_Type> make_unique(_Arg1&& arg1, _Arg2&& arg2, _Arg3&& arg3, _Arg4&& arg4, _Arg5&& arg5, _Arg6&& arg6) {
return std::unique_ptr<_Type>(new _Type(std::forward<_Arg1>(arg1), std::forward<_Arg2>(arg2), std::forward<_Arg3>(arg3), std::forward<_Arg4>(arg4), std::forward<_Arg5>(arg5), std::forward<_Arg6>(arg6)));
}

/// <summary>
/// Cross platform utility function for performing case insensitive string equality comparison.
/// </summary>
Expand Down
3 changes: 2 additions & 1 deletion Release/include/cpprest/http_compression.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,8 @@ _ASYNCRTIMP std::unique_ptr<compress_provider> make_deflate_compressor(int compr
/// A caller-owned pointer to a Brotli compression provider, or to nullptr if the library was built without built-in
/// compression support.
/// </returns>
_ASYNCRTIMP std::unique_ptr<compress_provider> make_brotli_compressor(uint32_t window, uint32_t quality, uint32_t mode);
_ASYNCRTIMP std::unique_ptr<compress_provider> make_brotli_compressor(
uint32_t window, uint32_t quality, uint32_t mode, uint32_t block, uint32_t nomodel, uint32_t hint);
} // namespace builtin

/// <summary>
Expand Down
108 changes: 71 additions & 37 deletions Release/src/http/common/http_compression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ class zlib_compressor_base : public compress_provider

if (m_state != Z_OK && m_state != Z_BUF_ERROR && m_state != Z_STREAM_ERROR)
{
throw std::runtime_error("Prior unrecoverable compression stream error " +
std::to_string(m_state));
throw std::runtime_error("Prior unrecoverable compression stream error " + std::to_string(m_state));
}

if (input_size > std::numeric_limits<uInt>::max() || output_size > std::numeric_limits<uInt>::max())
Expand Down Expand Up @@ -294,8 +293,17 @@ class brotli_compressor : public compress_provider

brotli_compressor(uint32_t window = BROTLI_DEFAULT_WINDOW,
uint32_t quality = BROTLI_DEFAULT_QUALITY,
uint32_t mode = BROTLI_DEFAULT_MODE)
: m_algorithm(BROTLI), m_window(window), m_quality(quality), m_mode(mode)
uint32_t mode = BROTLI_DEFAULT_MODE,
uint32_t block = 0,
uint32_t nomodel = 0,
uint32_t hint = 0)
: m_algorithm(BROTLI)
, m_window(window)
, m_quality(quality)
, m_mode(mode)
, m_block(block)
, m_nomodel(nomodel)
, m_hint(hint)
{
(void)reset();
}
Expand Down Expand Up @@ -323,42 +331,36 @@ class brotli_compressor : public compress_provider
}

const uint8_t* next_in = input;
size_t avail_in;
size_t avail_in = 0;
uint8_t* next_out = output;
size_t avail_out = output_size;
size_t total_out;

if (BrotliEncoderHasMoreOutput(m_stream) == BROTLI_TRUE)
{
avail_in = 0;
// Drain any compressed bytes remaining from a prior call
do
{
m_state = BrotliEncoderCompressStream(m_stream,
(hint == operation_hint::is_last) ? BROTLI_OPERATION_FINISH
: BROTLI_OPERATION_FLUSH,
&avail_in,
&next_in,
&avail_out,
&next_out,
&total_out);
m_state = BrotliEncoderCompressStream(
m_stream, BROTLI_OPERATION_FLUSH, &avail_in, &next_in, &avail_out, &next_out, &total_out);
} while (m_state == BROTLI_TRUE && avail_out && BrotliEncoderHasMoreOutput(m_stream) == BROTLI_TRUE);
}

if (m_state == BROTLI_TRUE && avail_out)
if (m_state == BROTLI_TRUE && avail_out && input_size)
{
// Compress the caller-supplied buffer
avail_in = input_size;
do
{
m_state = BrotliEncoderCompressStream(m_stream,
(hint == operation_hint::is_last) ? BROTLI_OPERATION_FINISH
: BROTLI_OPERATION_FLUSH,
&avail_in,
&next_in,
&avail_out,
&next_out,
&total_out);
m_state = BrotliEncoderCompressStream(
m_stream, BROTLI_OPERATION_FLUSH, &avail_in, &next_in, &avail_out, &next_out, &total_out);
} while (m_state == BROTLI_TRUE && avail_out && BrotliEncoderHasMoreOutput(m_stream) == BROTLI_TRUE);
}
else
{
// We're not compressing any new data; ensure calculation sanity
input_size = 0;
}

if (m_state != BROTLI_TRUE)
{
Expand All @@ -367,7 +369,18 @@ class brotli_compressor : public compress_provider

if (hint == operation_hint::is_last)
{
m_done = (BrotliEncoderIsFinished(m_stream) == BROTLI_TRUE);
if (avail_out)
{
// Make one more pass to finalize the compressed stream
_ASSERTE(!avail_in);
m_state = BrotliEncoderCompressStream(
m_stream, BROTLI_OPERATION_FINISH, &avail_in, &next_in, &avail_out, &next_out, &total_out);
if (m_state != BROTLI_TRUE)
{
throw std::runtime_error("Unrecoverable error finalizing compression stream");
}
m_done = (BrotliEncoderIsFinished(m_stream) == BROTLI_TRUE);
}
}

input_bytes_processed = input_size - avail_in;
Expand Down Expand Up @@ -415,7 +428,19 @@ class brotli_compressor : public compress_provider
}
if (m_state == BROTLI_TRUE && m_mode != BROTLI_DEFAULT_MODE)
{
m_state = BrotliEncoderSetParameter(m_stream, BROTLI_PARAM_MODE, m_window);
m_state = BrotliEncoderSetParameter(m_stream, BROTLI_PARAM_MODE, m_mode);
}
if (m_state == BROTLI_TRUE && m_block != 0)
{
m_state = BrotliEncoderSetParameter(m_stream, BROTLI_PARAM_LGBLOCK, m_block);
}
if (m_state == BROTLI_TRUE && m_nomodel != 0)
{
m_state = BrotliEncoderSetParameter(m_stream, BROTLI_PARAM_DISABLE_LITERAL_CONTEXT_MODELING, m_nomodel);
}
if (m_state == BROTLI_TRUE && m_hint != 0)
{
m_state = BrotliEncoderSetParameter(m_stream, BROTLI_PARAM_SIZE_HINT, m_hint);
}

if (m_state != BROTLI_TRUE)
Expand All @@ -439,6 +464,9 @@ class brotli_compressor : public compress_provider
uint32_t m_window;
uint32_t m_quality;
uint32_t m_mode;
uint32_t m_block;
uint32_t m_nomodel;
uint32_t m_hint;
const utility::string_t& m_algorithm;
};

Expand Down Expand Up @@ -599,7 +627,8 @@ class generic_decompress_factory : public decompress_factory
static const std::vector<std::shared_ptr<compress_factory>> g_compress_factories
#if defined(CPPREST_HTTP_COMPRESSION)
= {std::make_shared<generic_compress_factory>(
algorithm::GZIP, []() -> std::unique_ptr<compress_provider> { return utility::details::make_unique<gzip_compressor>(); }),
algorithm::GZIP,
[]() -> std::unique_ptr<compress_provider> { return utility::details::make_unique<gzip_compressor>(); }),
std::make_shared<generic_compress_factory>(
algorithm::DEFLATE,
[]() -> std::unique_ptr<compress_provider> { return utility::details::make_unique<deflate_compressor>(); }),
Expand All @@ -619,15 +648,17 @@ static const std::vector<std::shared_ptr<decompress_factory>> g_decompress_facto
algorithm::GZIP,
500,
[]() -> std::unique_ptr<decompress_provider> { return utility::details::make_unique<gzip_decompressor>(); }),
std::make_shared<generic_decompress_factory>(
algorithm::DEFLATE,
500,
[]() -> std::unique_ptr<decompress_provider> { return utility::details::make_unique<deflate_decompressor>(); }),
std::make_shared<generic_decompress_factory>(algorithm::DEFLATE,
500,
[]() -> std::unique_ptr<decompress_provider> {
return utility::details::make_unique<deflate_decompressor>();
}),
#if defined(CPPREST_BROTLI_COMPRESSION)
std::make_shared<generic_decompress_factory>(
algorithm::BROTLI,
500,
[]() -> std::unique_ptr<decompress_provider> { return utility::details::make_unique<brotli_decompressor>(); })
std::make_shared<generic_decompress_factory>(algorithm::BROTLI,
500,
[]() -> std::unique_ptr<decompress_provider> {
return utility::details::make_unique<brotli_decompressor>();
})
#endif // CPPREST_BROTLI_COMPRESSION
};
#else // CPPREST_HTTP_COMPRESSION
Expand Down Expand Up @@ -713,7 +744,6 @@ std::shared_ptr<decompress_factory> get_decompress_factory(const utility::string
return std::shared_ptr<decompress_factory>();
}


std::unique_ptr<compress_provider> make_gzip_compressor(int compressionLevel, int method, int strategy, int memLevel)
{
#if defined(CPPREST_HTTP_COMPRESSION)
Expand All @@ -740,14 +770,18 @@ std::unique_ptr<compress_provider> make_deflate_compressor(int compressionLevel,
#endif // CPPREST_HTTP_COMPRESSION
}

std::unique_ptr<compress_provider> make_brotli_compressor(uint32_t window, uint32_t quality, uint32_t mode)
std::unique_ptr<compress_provider> make_brotli_compressor(
uint32_t window, uint32_t quality, uint32_t mode, uint32_t block, uint32_t nomodel, uint32_t hint)
{
#if defined(CPPREST_HTTP_COMPRESSION) && defined(CPPREST_BROTLI_COMPRESSION)
return utility::details::make_unique<brotli_compressor>(window, quality, mode);
return utility::details::make_unique<brotli_compressor>(window, quality, mode, block, nomodel, hint);
#else // CPPREST_BROTLI_COMPRESSION
(void)window;
(void)quality;
(void)mode;
(void)block;
(void)nomodel;
(void)hint;
return std::unique_ptr<compress_provider>();
#endif // CPPREST_BROTLI_COMPRESSION
}
Expand Down
Loading