Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions brotli.c
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ static zend_string *php_brotli_output_handler_load_dict(php_brotli_context *ctx)
{
char *file = BROTLI_G(output_compression_dict);
if (!file || strlen(file) == 0) {
BROTLI_G(compression_coding) &= ~PHP_BROTLI_ENCODING_DCB;
return NULL;
}

Expand All @@ -392,6 +393,7 @@ static zend_string *php_brotli_output_handler_load_dict(php_brotli_context *ctx)
if (!stream) {
php_error_docref(NULL, E_WARNING,
"brotli: failed to load dictionary");
BROTLI_G(compression_coding) &= ~PHP_BROTLI_ENCODING_DCB;
return NULL;
}

Expand All @@ -417,6 +419,7 @@ static zend_string *php_brotli_output_handler_load_dict(php_brotli_context *ctx)
php_stream_close(stream);

if (!dict) {
BROTLI_G(compression_coding) &= ~PHP_BROTLI_ENCODING_DCB;
return NULL;
}

Expand Down
26 changes: 26 additions & 0 deletions tests/ob_dcb_005.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--TEST--
output handler: br,dcb: invalid output_compression_dict
--SKIPIF--
<?php
if (BROTLI_DICTIONARY_SUPPORT === false) die('skip dictionary not supported');
if (false === stristr(PHP_SAPI, 'cgi')) die('skip need sapi/cgi');
?>
--GET--
ob=dictionary
--ENV--
HTTP_ACCEPT_ENCODING=br,dcb
HTTP_AVAILABLE_DICTIONARY=:4SycXHyLhvKPL/nNaYXl60myMwris2L4X1O+q5tW1XE=:
--FILE--
<?php

ini_set('brotli.output_compression', 1);
ini_set('brotli.output_compression_dict', '');

include(dirname(__FILE__) . '/data.inc');
echo "{$data}";
?>
--EXPECT_EXTERNAL--
files/ob_data.br
--EXPECTHEADERS--
Content-Encoding: br
Vary: Accept-Encoding
Loading